merged with heroku support
deleted blog categorization controller
Merge branch 'edit-categories' of github.com:zachjyoung/feedilizer into edit-categories
merging master into edit-categories