Update build config

- Upgrade to 2.11.1 (but add a cross-compilation target for 2.10.4)
- Upgrade to scalatest 2.2.0
Oops. Need to upgrade to latest sbt for last commit to work
Merge pull request #3 from jedesah/feature/build_upgrade

Update build config