Finally finished getting mavenized, mavenized!
Merge remote-tracking branch 'origin/master'