Merge pull request #167 from csmith/master

Re-add manifest to fat jar...
Tidy up gradle source sets.

This replaces the default source directories (src/main/java, etc)
with our own, instead of just appending ours to the list.