Merge pull request #41 from randy-waterhouse/master

Distribution fixes for tarball.