Updated to latest scala
Trying to get database to connect. Swiched in memdb
Fixed update merge
Finally finished upgrade to Play 2.1.0. Classes are compiling successfully.