Switched project to Tomcat. Note: created a separate branch called 'apache'
to preserve the apache version of the project.