reformatting, refactoring, and retesting controllers
continuing to refactor controllers and services, and rewriting controller tests to actually test the way the functions work now; up to search controllers
Merge pull request #79 from CombustibleLemons/devon

Reformatted controllers and services slightly