Changes to vimrc
Merge branch 'master' of github.com:tholowka/vim-stuff