Vimrc updated.
Merge branch 'master' of https://github.com/pierce-m/config