Use maven annotations

Upgrade to using java 5 annotations for maven as it is much cleaner.
Update assembly plugin
minor cleanup on formatting to be in sync.