Migrate to Scala 2.10

I did my best to maintain the Xeralux-specific changes. I first merged the upstream master branch, and then the upstream 2.10 branch (which is a bit behind master).