Formatting change
Merge branch 'master' of github.com:collectiveaccess/providence
Merge branch 'master' of github.com:collectiveaccess/providence
Added two new options to media importer:
	1. Ability to match records on parent directory name in addition to file name
	2. Ability to delete media once it has been successfully imported