Swapping in Layershift, they've had really responsive service.
Merge branch '2.2' of github.com:scalatra/scalatra-website into 2.2