Upgraded to Gradle 2.1