- Fixed a lot of depreciation issues
- Updated to use Scala 2.10.3 and SBT 0.13.0
- Removed old comment
Resolve merge conflicts