Move all variables to tomcat:params, parameterize version so we can install tomcat6 or tomcat7
Remove unnecessary line