Update git push matching for Xcode
Merge branch 'master' of https://github.com/tomharrison/dotfiles

* 'master' of https://github.com/tomharrison/dotfiles:
  Only auto-open NERDTree in gvim
  Move file type detection out of .vimrc
  Add npm to path