Configuration improvements.
Validate uniqueness of names.
Merge branch 'master' into integrated

Conflicts:
	app/models/person.rb