Bump gradle plugin version and minor changes for build.gradle file

Bump gradle plugin version and minor changes for build.gradle file.
@chrisbanes Chris, it works but is it correct or not ?