Changes to accommodate Play 2.3 and sbt-web