Change scala version to scala 2.10.4
Target JVM 1.7
The organization should match the one used previously on the OCS and scala 2.10
Cosmetic code formatting updates