moving files around
moving some more files around
move bouncer certs back into server-wide config for now
Merge branch 'master' of github.com:indiehosters/dockerfiles
rename k1 folder back to default
use /data/server-wide and /data/per-user in run.sh