Updated to gradle dist 1.8 and gradlew 0.6.+