a lot of change to vimrc
Merge branch 'master' of github.com:ggarlic/dotfiles