Renamed a few project-level holdovers from earlier version.
Merge branch 'master' of github.com:scalatra/scalatra-in-action