Make admin.py use new format (old one still works, but this is nicer), also combine multiple @hook.command hooks into one.