Fixing bugs for Tomcat 8.0.12, servlet-api 3.1.0 and updating to Savant