Updates
Merge branch 'master' of github.com:comand/dotvim

Conflicts:
	vimrc
Clean up unused plugins.