Second .vimrc file version
Merge branch 'master' of github.com:dabril/vim