Move to 2.10
Fix issues with pull request #1
Add in basic scala tests