Switching to servlets and pulling out the GWT extra things added in the sample project before
Added extra servlets and other features for 2.0 deploy