Upgrading to gradlew 2.1