Nothing fancy, just not obviously broken like the old one. Fixes #589.
Fix merge conflict on override/collections.html.erb
Fix test failure.
Merge pull request #662 from afred/collections-landing-589

Nothing fancy, just not obviously broken like the old one. Fixes #589.