Merge pull request #135 from csmith/master

Tidy up gradle source sets.
Gradle version bump.