Update gradle to 2.2.1

This deprecates pull request #712, Was not my intention to make that request off my master branch. :D