Reviewer Mike - Live test install fixes

Mike, this resolves the issues you were having with the live-test install.  Please review.

I'll also send you an update to the wiki docs once I've done that.