Merge branch 'master' of github.com:mortonfox/myvimrc

Conflicts:
_vimrc
Last updated
Switch to Shift-F7 for NERDTreeFind.

Ctrl-F7 is already used for something under OS X.
Turn off syntastic balloons.
Add matchit

Conflicts:
_vimrc
Merge branch 'master' of github.com:mortonfox/myvimrc
Merge branch 'master' of https://github.com/mortonfox/myvimrc