Gradle changes

Some minor changes to the build and the gradle plugin