Added a vimpc config
Merge branch 'master' of https://github.com/Derecho/Dotfiles
Merge branch 'master' into desktop