Fixing a bunch of javadoc warnings
Merge pull request #623 from reines/fix_doc_warnings

Fixing a bunch of javadoc warnings