update vimrc
Merge branch 'master' of github.com:xwyam/configuration