Addition of subset of functionality from ingest-config branch

Integrates code selected from early (circa May 16, 2012) commits to the ingest-config branch.