Add apikeys.conf creation to makeconfig, add admin? command [WIP]
Merge branch 'master' into bleeding