changed and cleaned up .vimrc
Merge branch 'master' of https://github.com/texhnolyze/scripts-and-.dotfiles