Update to use Tomcat 7