Merge pull request #183 from jasobrown/1.1

pulling in latest changes to netflix gradle build template
Merge remote-tracking branch 'upstream/1.1' into 1.1