Update to scala 2.10 and fix a few bugs with class loading