split up modifications of reverted commit

Here is that commit split up a bit
Denny, the problem I have with this, is that it leaves a tons of files on the artifacts server for producing the docs.  I know you are not a big fan of where this runs. But it just simplifies our process of running it through our staging server.  So I might not integrate this portion.