Another change to the new doc build setup.

This time all contingencies tested!
Merge pull request #240 from hjoliver/doc-build-change

Another change to the new doc build setup.