Some changes to build files for pushing to Sonatype/Maven Central