refs #2885 added a couple of new search engines
Fixes #3973, make sure segment delete confirmation div uses unique ID.
Moved some functions for better code clarity.
Completed initial refactoring.
Fixing build.
Merge branch 'master' into archive_name_refactor
Attempted to get tests to pass.
Fix tests.
Remove debug code.
Cleaned up some TODOs added some more.
Tweaked some documentation.
Merge branch 'master' into 1459
Merge branch 'archive_name_refactor' into 1459

Conflicts:
	core/Archive.php
Uncommitted change.
More work on getting tests to pass.