Ported Gradle files to conform with Gradle 2.1