switched out feed_type tuple for new model
Merge branch 'master' of https://github.com/bjdixon/curator