some alias fixes, no more sourcetree in gitconfig, hist-change, submodules

gitconfig

@@ -38,17 +38,7 @@
   fac = push origin refac
   subup = submodule foreach git pull
   rs = reset master --hard
-  hist = log --pretty=format:\"%h | %ad | %s%d [%an]\" --graph --date=local
+  hist = log --pretty=format:\"%h | %ad | %an | %s%d \" --graph --date=local
   lo = log --graph --decorate --pretty=oneline --abbrev-commit --all
   type = cat-file -t
   dump = cat-file -p
-
-[merge]
-  tool = sourcetree
-  summary = true
-[difftool "sourcetree"]
-	cmd = opendiff \"$LOCAL\" \"$REMOTE\"
-	path = 
-[mergetool "sourcetree"]
-	cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
-	trustExitCode = true

gitignore

@@ -14,8 +14,9 @@
 *.sass-cache
 .tmp_*
 .revision
+_srcs
 
-# OS or editor folders
+# OS or editor folders and files
 .DS_Store
 Thumbs.db
 .cache
@@ -26,6 +27,7 @@ Thumbs.db
 nbproject
 *.komodoproject
 .komodotools
+NERD_tree*
 
 # vcs-folders to ignore
 .hg

vim/bundle/ctrlp

@@ -1 +1 @@
-Subproject commit b7cb2f539d6f14443ccff7c3fa14da9049bcaab0
+Subproject commit 309d29d0c7e40d2de7b81a19ba96234640a17157

vim/bundle/fugitive

@@ -1 +1 @@
-Subproject commit 381b275bc97231a12537731cfd1874263273d7dd
+Subproject commit b5725c1eec2f596a8e1f6295a4640b2392e5e550

vim/bundle/git

@@ -1 +1 @@
-Subproject commit 2d54fb2b87fe3b74c2fb00edcfaa1f711944e6ea
+Subproject commit 75bc1628833ee1f1d8ecb8a66c5df852554c9a19

vim/bundle/supertab

@@ -1 +1 @@
-Subproject commit ee35ab6954a11337a2b52003d07fabe442843b68
+Subproject commit 12f3dc40fdfa3572a5b923e7a174516d46f2f78c

vim/bundle/syntastic

@@ -1 +1 @@
-Subproject commit e5dfcc3488e407c8e28b308cb6e631336e77d060
+Subproject commit 65091e5dc8006f252146390622b0e567f50346bd

vim/bundle/tagbar

@@ -1 +1 @@
-Subproject commit 45697796012866ceda4dd0ef1b66e4c8a0e74546
+Subproject commit a34acf4f63a9a4c3d80dd9df8edf90406acc3354

vim/bundle/tlib

@@ -1 +1 @@
-Subproject commit ba7fb09ce698116071aef7caed495ddd83f68f10
+Subproject commit b156d98562a34c4b30ba3d9f1229daff55d414c7

zshrc

@@ -36,8 +36,8 @@ alias vd='mvimdiff'
 alias diff='mvimdiff'
 
 # easy hosts-editing
-alias hosts='_ v /etc/hosts'
-alias vhosts='_ v /etc/apache2/extra/httpd-vhosts.conf'
+alias hosts='_ mvim /etc/hosts'
+alias vhosts='_ mvim /etc/apache2/extra/httpd-vhosts.conf'
 
 # Easier navigation: .., ..., ~ and -
 alias ..='cd ..'