Serve JSON with correct Content-Type
Make the logo clickable
Prevent scary ActiveRecord warning
Remove TomsCache because we don't use CSV anymore
Add counter caches to count contributions received and sent
Make SocrataFetcher implement Enumerable
Add contributions count to candidates tables
Merge remote-tracking branch 'origin/master'

* origin/master:
  Serve JSON with correct Content-Type
  Remove local data CSVs
  Fix nested SQL causing ActiveRecord deprecation warning

Conflicts:
	app.rb
Merge remote-tracking branch 'origin/master'

* origin/master:
  Add contributions count to candidates tables
  Make SocrataFetcher implement Enumerable
  Add counter caches to count contributions received and sent
  Remove TomsCache because we don't use CSV anymore
  Prevent scary ActiveRecord warning
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  resized charts again
  adjusted display of sidebar. Moved chart size to config.
  added borders and shrunk the charts a bit on the first page.
  made some styling changes to the header and sidebar. Started work on candidate page, but still more to do.
  made some styling changes to the header and sidebar. Started work on candidate page, but still more to do.
  switched Merriweather to Crete Round in order to match Elina's spec
  Added instructions for installing ruby to readme and added foreman to gemfile
  Added instructions for installing ruby to readme and added foreman to gemfile

Conflicts:
	views/layout.haml