Remove Puppetlabs syntax files
Add 'ajf/puppet-vim' bundle and sort
Merge branch 'master' of ssh://gitlab/devops/zach

Conflicts:
	vim/vimrc