Updated all maven plugins to latest versions.

Also did some minor cleanup / reoganization of the pom