Upgrading to Gradle latest and greatest