updated .vimrc settings
Merge branch 'master' of https://github.com/lancew/dotfiles