added tomcat to qa environment
Merge branch 'master' of github.com:DBMoUK/puppet_repository

Conflicts:
	Puppetfile
Removed a module