Merge branch 'local-users'
Better handling of singleuser servers
Remove -m flag from singleuser
Try only adding users to their own container