Refactor the controllers to cleanup after the homepage_controller was added
Merge pull request #409 from projecthydra/refactor_controllers

Refactor the controllers to cleanup after the homepage_controller was added