Shuffling things around so we can test.
Merge branch 'master' of github.com:nprapps/elections14