Demo cleanup prior to 0.0.1 release
Tomcat support for cloudbees