Fixed filtering methods
Fixed filtering methods
Fix overzealousness
pep8
more pep8
more pep8
Merge pull request #1089 from DirectEmployers/actually-use-canonical-company

Make setting a company and getting a list of sites for a company use canonical_company [PD-886]
Merge branch 'master' of github.com:DirectEmployers/MyJobs into fix-locations