Update Dockerfile and change to use supervisor to start guacd and tomcat itself rather than via service.