Upgraded to scala 2.10

My first real project in 2.10!