Strip html in display_name
Merge branch 'rails-4'