should not have changed this from fetch
Merge branch 'master' of https://github.com/BorwickAtVT/puppet-config

Conflicts:
	modules/vtconfig/files/Makefile
Merge branch 'master' of https://github.com/BorwickAtVT/puppet-config