Silence documentation build error; include contrib/ in distribution

This patchset will silence a makeinfo error and include the contrib/ directory and contents in the distribution built by mkdist.sh.