more 2000 loader work
Merge branch 'dev' of https://github.com/openelections/core into dev