Merge branch 'recipe-tags-categories-search-tier1-tier2' of https://github.com/cosborne89/dormchef into recipe-tags-categories-search-tier1-tier2

Conflicts:
db/development.sqlite3