Update with several plugins.
Merge branch 'master' of https://github.com/cbtlsl/vim

Conflicts:
	.vimrc