Changed double declarations to shorthand, changed overridden method javadocs to inherit parent docs
Tweaked ant file to generate javadoc