Merge pull request #173 from fdelapena/master

Fix "make dist" tarball generation and other building fixes