Replace references to omni/city_isp_org. Add deprecation warnings.
Merge pull request #6 from maxmind/greg/renaming-fixes

Replace references to omni/city_isp_org. Add deprecation warnings.
Merge branch 'master' into greg/private-ip-exception

Conflicts:
	Changes