Merge branch 'actually-use-canonical-company' into fix-locations
Fixed deleted location logic
Merge branch 'master' of github.com:DirectEmployers/MyJobs into fix-locations
Merge branch 'master' of github.com:DirectEmployers/MyJobs into fix-locations
Merge pull request #1095 from DirectEmployers/fix-locations

Fix locations