Fix tomcat ram
Merge branch 'master' of github.com:nigelb/puppet-swoop

Conflicts:
	manifests/init.pp