Now that scala-2.10 is merged into master, if you can keep merging into this PR and updating from here that would certainly make it easier I think to track changes etc (at least for now)