Resolve conflict
Merge branch 'master' of github.com:matalangilbert/dotfiles
Allow project specific .vimrc