Moving to Play 2.1 and cleaning up before merger with authentication code