Change from APT tomcat to manual download/install
Merge branch 'master' of github.com:drugis/dockerfiles