Updated java and tomcat chef cookbooks. WAR test not working yet
Merge branch 'master' of github.com:choreos/choreos_middleware