Edited vimrc with ideas from crvs's dotfiles
Merge branch 'master' of https://github.com/rsrsl/.vim