Midpoint in building the bar charts
Merge branch 'master'

Conflicts:
	follow_the_money/static/follow_the_money/css/main.css
	follow_the_money/static/follow_the_money/js/CityDigitsMap.js
	follow_the_money/static/follow_the_money/js/mapnav.js
	follow_the_money/templates/follow_the_money/index.html