bunch of new cool shit wow theres a lot of new cool shit. like it's just simply
amazing how vim can just keep getting better. I don't really believe it,
honestly.
Merge branch 'master' into lightweight

Conflicts:
	.vimrc