caught up both the httpCallback and feed mappers tests to the current build, also fixed the contest page to support the new ballot data that is being retrieved
Merge branch 'dev' of https://github.com/votinginfoproject/Metis into dev