fixxes and preparation for varnish migration
Merge branch 'master' of github.com:fliphess/techrobot

Conflicts:
	archive/server-updates.yaml