replace local with github master copy
Merge branch 'master' of
https://github.com/harvard-library/librarycloud_ingest

Conflicts:
	src/main/resources/META-INF/spring/camel-context.xml