Add shortname to Organization model and add organization-detection to bootstrap