Removed tomcat version hardcoding

Tomcat now uses two variables as mush as possible to display its full
filename - the tomcat_filename variable and the tomcat_version variable.
This should allow greater flexibility.