Added tomcat8 and more config tweaks