More benign javadoc and import cleanup [1055]
Merge pull request #20 from tommyjasmin/master

More benign javadoc and import cleanup [1055]