- Some code cleanup
- Updated to match changes from the latest Java branch
- Scala version updated to 2.11.0