Make sure Atom feeds are served with content type application/atom+xml

Fixes #961
Merge branch 'feed-content-type' into rails-3-develop