Fixed all the salmon.
Merge pull request #609 from Skylexia/patch-1

Fixed all the salmon.
Remove Javadocs from the default compile, use the javadoc:javadoc goal to generate them.
Merge pull request #1 from essentials/2.x

update