Merge branch 'release-10.6.2'
Merge branch 'release-11.0.2'
Merge branch 'develop'
Document development setup
Ignore generated API docs
Add .gitattributes to normalize line endings on different platforms
Revert "Add DPLAFest slide to home page"

This reverts commit 6409d68ee4ca9b4f73e84e12738b6e573c41cb6e.
Merge branch 'release-v11.0.4'
Adjust instructions so Gemfile editing isn't needed
Merge pull request #26 from tfmorris/devnotes

Document development setup
Disable subject facets
Remove Google analytics key
Merge branch 'release-11.0.5'
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 remote-tracking branch 'upstream/develop' into develop