SONs
Migrated to scala 2.10 and scalaz 7
merge
Fixed minor merge issues causing compiler errors