and back to macvim now - now time atm for tmux and terminal stuff

gitconfig

@@ -3,7 +3,7 @@
 
 [core]
   excludesfile = ~/.gitignore
-  editor = vim
+  editor = mvim -f
   autocrlf = input
   eol = lf
   pager = less -FXRS -x2
@@ -33,7 +33,6 @@
   ps = push
   pl = pull
   mg = merge
-  d = difftool
   unst = reset HEAD
   hub = push origin master
   fac = push origin refac
@@ -46,7 +45,11 @@
 
 [diff]
   tool = vimdiff
+  guitool = mvimdiff
 
-[difftool]
+[mergetool]
   prompt = false
-  cmd = /usr/local/bin/vimdiff "$LOCAL" "$MERGED" "$REMOTE"
+  keepBackup = false
+
+[difftool "mvimdiff"]
+  cmd = /usr/local/bin/mvimdiff -f "$LOCAL" "$MERGED" "$REMOTE"

oh-my-zsh

@@ -1 +1 @@
-Subproject commit b2748f6150a650b67ab4f07f554f117f0f10a892
+Subproject commit de19a57061f7f5f80205acbf466b43da67e994cc

vim/bundle/ctrlp

@@ -1 +1 @@
-Subproject commit 0d198fb5075ccd1dca4340a8b0e2725fb9a82bc8
+Subproject commit 3c6182371db8e8ede3789d21b52386569eda2208

vimrc

@@ -270,7 +270,6 @@ let g:Powerline_symbols = 'fancy'
 let g:Powerline_stl_path_style = 'short'
 call Pl#Theme#RemoveSegment('scrollpercent')
 
-
 " custom shift-tab mapping -- opens new { } and blank line
 " Supertab and snipmate backwards-key are overwritten to use shfit + alt / crtl
 let g:SuperTabMappingBackward = '<s-c-tab>'

zshrc

@@ -17,8 +17,8 @@ export COPY_EXTENDED_ATTRIBUTES_DISABLE=true
 export COPYFILE_DISABLE=true
 
 # editor
-export EDITOR=vim
-export VISUAL=vim
+export EDITOR=mvim
+export VISUAL=mvim
 
 # node.js
 export NODE_PATH=/usr/local/lib/jsctags/:$NODE_PATH
@@ -47,14 +47,14 @@ alias npmup='npm -g cache clean && npm -g update'
 alias rvmup='rvm get latest'
 alias upall='brewup && rvmup && gemup && npmup && dotup && dotsubup'
 
-# always use vim
-alias v='vim'
-alias vd='vimdiff'
-alias diff='vimdiff'
+# always use mvim but for 'vim'
+alias v='mvim'
+alias vd='mvimdiff'
+alias diff='mvimdiff'
 
 # easy hosts-editing
-alias hosts='_ vim /etc/hosts'
-alias vhosts='_ vim /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 ..'