Fix vimrc
Merge branch 'master' of github.com:jacopen/dotfiles