Some build.gradle enhancements

Pushed but doesn't work yet >_>