Translated vimrc to english. Cleanup
easy merge

Merge branch 'master' of https://github.com/angelcarballo/dotfiles