merge in changes from upstream gradle-template project
Merge pull request #25 from coryb/master

merge changes from gradle-template project