more vim plugins
Merge branch 'master' of github.com:stuarthicks/etc

Conflicts:
	vimrc