the_city_admin conflicts with the_city

[davbeck]

It would appear that you cannot use the_city and the_city_admin at the same time.

Steps to reproduce:

1. require 'the_city_admin'
2. require 'the_city'

Result:

TypeError: superclass mismatch for class User

Or, if you reverse 1 and 2:

TypeError: superclass mismatch for class Group

Expected result:

The two gems should not conflict with each other. If needed, when using both, specify their fully qualified class name.