Corrected the sbt version to use, and upgraded code to work with the present codebase.
Excluding junit-dep from junit-interface as it is deprecated by the JUnit project. JUnit 4.11 now brings in a minimal number of dependencies.
Merge pull request #1478 from huntc/junit-dep

Exclude junit-dep as it is deprecated
Fixed Akka logging config

In Akka 2.2 'event-handlers' is a deprecated config.
Fixed typo in migration guide for Play 2.2
Merge pull request #1484 from corruptmemory/fix-akka-logging-config

Fixed Akka logging config
Merge pull request #1485 from corruptmemory/fix-doc-typo

Fixed typo in migration guide for Play 2.2
Fix little typo is JsPath.scala

Just a little typo in `readNullable` documentation.
Merge pull request #1488 from studiodev/patch-1

Fix little typo is JsPath.scala
Do not allow setting null cookie values. null values are typically allowed in Java maps so it is confusing that they are not allowed here, but no error is given to indicate that
Merge pull request #1495 from benmccann/cookie-baker-encoding-fix

Throw a better exception when user tries to set null cookie value
updated scala anorm docs with better examples
Merge remote-tracking branch 'upstream/master'