remove whitespace
dont require content_subtype to be set to 'html'
Merge branch 'content_subtype_issue'