Clean up Makefile, maven a bit and switch local server to Jetty