scala-2.10 + minor updates for compatibility
0.6.0-pre-jdanbrown-5