Remove API key and move to a template file to prevent future problems
Remove API key and move to a template file to prevent future problems
Ignore settings file
Merge branch 'fix-settings' of git://github.com/tfmorris/dpla-frontend into tfmorris-fix-settings
Updated instructions and config files so that configuring settings for local develoment only requires copying a settings example file with environment-specific settings, instead of the main settings.yml
Line endings
Merge branch 'tfmorris-fix-settings' into develop

Conflicts:
	README.md