fixing up some bad plugins and adding some new ones
Merge branch 'master' of github.com:travisj/dotvim

Conflicts:
	.gitmodules