Pull in ubuntu-baseline, remove more gem berks, and use Tomcat7.