move more model imports
Merge branch 'master' of github.com:nprapps/elections14