rearrange a bunch of web stuff so we can serve it in one process
Merge branch 'docker' into docker-full