.vimrc cleanup

One commit to rule them all
Merge branch 'master' of github.com:fuglu/vim-files