Setting things up for inclusion into Sonatype's OSS repo

Biggest problem is that I formatted the code to use two spaces, so all the diffs are just epic.  =\

I also upgraded the required Java version to 1.7.