Migrate to Scala 2.10
Merge branch 'master' into jdevelop-migrate-scala-2.10
Updated travis config.
Merge pull request #13 from jdevelop/jdevelop-migrate-scala-2.10

migrate to scala 2.10