DRY more controllers
Merge branch 'master' of github.com:hannahhoward/poochpapa