play 23/scala 211

Changes to get it to work with scala 2.11.1.
Note that there are two tests failing, but they were also failing in the play-2.3 branch.
Perhaps this has to do with the version of elastic search, I am running 1.1.1