Merge vimrc-testing into master

Changes
=======
Yay everything is cooler.