Upgrade to Gradle 2.1