vimrc updates
Merge branch 'master' of github.com:andrewrchambers/vimconf
Merging and commiting