Upgraded to Maven Annotations

Use java 5 annotations for maven plugin plugin usage.
Added some missing curly brackets.
Replaced todo's with javadocs
Added a couple of missing javadocs
Merge pull request #5 from hazendaz/master

Upgraded to Maven Annotations