Upgraded to Groovy 2.3.6 and Gradle 2.1