work in progress commit, swapped out the camptocampt/tomcat puppeforge module for the one on github