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 generated API docs
Ignore settings file
Add .gitattributes to normalize line endings on different platforms
Merge branch 'release-11.0.5' into develop
Merge branch 'lineendings' of git://github.com/tfmorris/dpla-frontend into tfmorris-lineendings
Removed attributes for files types not currently in use
Merge branch 'ignore-docs' of git://github.com/tfmorris/dpla-frontend into tfmorris-ignore-docs
Update line endings in .gitignore
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
Limit /item route to only URL induced formats
Give item JSON route its own url helper name
Merge branch 'release-11.0.6'