Alias Vim in OS X so I get the good Homebrew one.
Merge branch 'master' of github.com:aaronbieber/dotfiles
Use simple push mode in git always.
Resolved merge conflicts.