Merge pull request #2 from adriaanm/master

Consolidate actual Scala module builds.
Fix OSGi settings