set vimdiff as default merge tool
cleanup
do not fold stuff
Makes foo-bar considered one word
Remap motions to navigate wrapped lines
Map Gundo
Merge branch 'master' of github.com:mrzool/dotfiles_macosx