Merge branch 'master' of github.com:btelles/vim

Conflicts:
	bundle/command_t