Add a bunch of stuff apparently
Merge branch 'master' of github.com:dtb/dotvim

Conflicts:
	.gitmodules
	vimrc