Update gradle setup
Merge pull request #903 from matthewprenger/master

Update gradle setup