fix properly
Merge pull request #1584 from rossriley/contenttypes-more-configurable

fix properly