Upgraded to Scala 2.11.0
Added explicit empty tuple (Unit) to avoid warning
Merge branch 'master' of https://github.com/concrete-cp/cspom