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

Conflicts:
_vimrc