Fucking .gitignore.  Fix transition to polymorphic service scopes.
Convert to use hive scope in testing.