simple_format doesn't work in Rails 3

Due to html_safe and concat, simple_format is currently broken. It
would be nice to get these patches in before Rails 3 is finalized:

https://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/3767-patch-simple_format-output-should-not-be-html-escaped-in-rails-3