Cleanup
Use Nifty + Thrift instead of Jetty
Be more discerning with intellij excludes