scala-2.10 + minor updates for compatibility
2.1.3-jdanbrown-1
2.1.4-SNAPSHOT (revert)