Extra changes for ident->name change
Merge origin/dbrefuctor into dbrefuctor

Conflicts:
	domos/util/db.py