vim-puppet and vim-rsi
update bundled modules
Merge branch 'master' of https://github.com/chrisholmes/vimfiles into HEAD

Conflicts:
	.gitmodules
	bundle/vim-puppet
remove vim-go