made a bunch of changes for the  video demo
Merge branch 'visual_refresh' of git://github.com/cwackerman/ElectionNightReportingService into cwackerman-visual_refresh

* 'visual_refresh' of git://github.com/cwackerman/ElectionNightReportingService:
  made a bunch of changes for the  video demo

Conflicts:
	config/database.yml
	db/schema.rb
	db/seeds.rb