updated vimrc, now uses vimplug
Merge branch 'master' of https://github.com/Tritlo/dotfiles