Always rebase on pull, and add in reuse recorded resolution
Add in NERDTree
Check syntax after save was slowing vim down big time, so disable
Ignore code coverage files in Command-T, and make putting vim into the background easier