Improved deploy, switch to tomcat

- tomcat can build runnable war