Merge pull request #166 from csmith/master

Fix duplicate jar contents.
Re-add manifest to fat jar...