Changes for DM
Merge branch 'master' of https://github.com/cdlib/shortcake

Conflicts:
	duplicate_url_reporter.rb