Updated installer to work with tomcat & httpd in f19

In f19 its called tomcat while in f18 & RHEL its tomcat 6

So fixed the puppet script to work with both