Update master

We're not doing deploys any longer, but we can keep this branch as a "stable" version of the dev portal for offline use