Merge pull request #15 from csmith/master

Tidy up gradle source sets.
Gradle version bump, now DNS works.