Used my new merge branch as a base to fix location ordering instead
Added a states module with a synonyms dict to be used for filtering on state
Commented states module
Didn't realize postajobs had a static method that provided what states.states was providing...
Added missing US regions (Mississippi, Virgin Islands, APO, etc)
using map instead of choices, since choices doesn't provide abbreviations.
Merge pull request #847 from DirectEmployers/sorting-fix

[PD-457] Location sorting fix
Added another missing static file
Merge branch 'merge-without-activation-changes' of github.com:DirectEmployers/MyJobs into merge-without-activation-changes
Base password-reset stuff
Fix failing tests
Merge branch 'merge-without-activation-changes' into fix-failing-tests
Removed print
Merge pull request #850 from DirectEmployers/password-reset

Password reset [PD-312]
Merge branch 'merge-without-activation-changes' of github.com:DirectEmployers/MyJobs into fix-state-filter-take-2
Merge pull request #849 from DirectEmployers/fix-failing-tests

Fix failing tests
Re-added states import
Remove dependency on Services from ETL Loader
Merge branch 'merge-without-activation-changes' into fix-state-filter-take-2
Accidentally re-added the slashes which should NOT have been there.