Add initial support for embedding jetty.  Large scale cleanup of tests. Change default port to 2222