Updated Scala version, added ScalaTest
Merge pull request #1 from jamie-allen/master

Updated Scala version, added ScalaTest