removed all instances of test code asking for object_urls
ignoring stuff
merge of mozilla_inventory work
Merge branch 'inventory_merge' into master_merge2

Conflicts:
	.gitignore
	cyder/core/search/compile_search.py
	cyder/core/search/compiler/compiler.py
	cyder/core/search/compiler/lexer.py
	cyder/core/search/compiler/parser.py
	cyder/core/search/compiler/tokenizer.py
	cyder/core/search/parser.py
	cyder/core/search/search.py
	cyder/core/search/views.py
	cyder/core/system/models.py
	cyder/cydhcp/bulk_change/views.py
	cyder/cydhcp/interface/static_intr/models.py
	cyder/cydhcp/interface/static_intr/tests/A_tests.py
	cyder/cydhcp/interface/static_intr/tests/CNAME_tests.py
	cyder/cydhcp/interface/static_intr/tests/PTR_tests.py
	cyder/cydhcp/interface/static_intr/tests/aux_attrs.py
	cyder/cydhcp/interface/static_intr/tests/basic.py
	cyder/cydhcp/interface/static_intr/tests/deletetion.py
	cyder/cydhcp/interface/static_intr/tests/ipv6_basic.py
	cyder/cydhcp/interface/static_intr/tests/system_integration.py
	cyder/cydhcp/lib/tests/free_ip.py
	cyder/cydhcp/lib/tests/intr_from_range.py
	cyder/cydhcp/network/models.py
	cyder/cydhcp/range/models.py
	cyder/cydhcp/site/models.py
	cyder/cydhcp/urls.py
	cyder/cydhcp/utils.py
	cyder/cydhcp/vlan/models.py
	cyder/cydns/api/tests/basic.py
	cyder/cydns/api/tests/ptr.py
	cyder/cydns/api/v1/api.py
	cyder/cydns/cname/models.py
	cyder/cydns/domain/tests/auto_create.py
	cyder/cydns/domain/tests/auto_delete.py
	cyder/cydns/domain/tests/auto_update.py
	cyder/cydns/domain/tests/basic.py
	cyder/cydns/domain/tests/full_name.py
	cyder/cydns/ip/models.py
	cyder/cydns/mixins.py
	cyder/cydns/models.py
	cyder/cydns/nameserver/models.py
	cyder/cydns/nameserver/tests/test_models.py
	cyder/cydns/ptr/models.py
	cyder/cydns/soa/models.py
	cyder/cydns/tests/test_views.py
	cyder/cydns/utils.py
	cyder/dnsutils/inventory_build.py
	cyder/settings/base.py
	cyder/urls.py
Revert "work on perms"

This reverts commit 40eed1584435ee1a7e5bb1804ad7fc45a94dc4e2.
more mergeing