backporting stuff from inventory.

Conflicts:
	cyder/cydhcp/interface/static_intr/models.py
	cyder/cydns/address_record/models.py
	cyder/cydns/tests/test_views.py
	cyder/settings/base.py
minor fixes