Delete demo keys, update demos to use same environment vars as regressions

Fine with this in the short term, but filed #384 and assigned to myself to reduce repeated code.