redo site output
Merge branch 'stage'
remove future stuff
Merge branch 'stage'
Put back future stuff

This reverts commit a36e5345bfb0e8527d774a3d5debf7945a13c2e8.