Including all generic content types from snoopie's original carrierwave pull request