Upgrade to gradle 2.2

Upgrade to latest version of Gradle from http://www.gradle.org