Update Gradle to v2.1
Update version numbers
Merge PR #1342 by @msteiger - Gradle 2.1 upgrade
Gradle/Artifactory checkpoint - "It works on my machine!" worthy, needs more tweaking and testing