Fixes for make distcheck
Merge pull request #14 from pbauman/makedistcheck_fixes

Fixes for make distcheck