Basic implementation of factory_boy, ref #306
put factory_boy in correct requirements file, ref #306
fix merge conflicts
Merge remote-tracking branch 'upstream/master'
migrate tests to use EventFactory
cleanup test
set up a scoreboard page with count of events per country
adding population with countries_plus for scoreboard score
cleaning up code
making the scoreboard better looking
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into scoreboard
fix runserver breakage
Merge pull request #342 from gandalfar/master

fix runserver breakage
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into scoreboard
cleaning up the code
added check for population 0 or null
fix requirements conflicts
added test for scoreboard results