refactoring the scaling code, now with more ems.
fixing conflicts
Merge branch 'master' of github.com:nprapps/elections14