Updated javadoc task to include two new packages.
Fixed a silly javadoc comment warning.
Did the package comments wrong, this looks nicer format-wise.