Make AsideUsageKey and AsideDefinitionKey into UsageKeys and DefinitionKeys
Merge pull request #49 from cpennington/unify-aside-keys

Make AsideUsageKey and AsideDefinitionKey into UsageKeys and DefinitionKeys.