Changes to build scripts due to Gradle 1.4