Merge pull request #6 from swenson/master

Update to Scala 2.9.2
Added javadoc, null java class so that push succeeds