This is going to be annoying to merge
Merge branch 'master' of https://github.com/csherland/dotfiles
Config fixes for syntastic and cntrlp
This is an annoying thing to change back and forth