Merge pull request #194 from csmith/master

Minor tidying.
Make dependencies use gradlew again.

This should cache the gradle binary and save us a load of time.