fix the ability to have html safe values for keys ending with '_html'
Merge branch 'master' into rails-3