Scala 2.10 

This updates to latest master with scala 2.10 support.