clean up
some things
Merge branch 'master' of github.com:Cadair/dotvim

Conflicts:
	.gitmodules