Change so that it compiles with Scala 2.11

I'm not really sure how people normally add support for multiple versions of Scala, but here are the (slight) changes I had to make to the project to have the tests pass on 2.11.