Add percentage of contributions from Oakland
Merge remote-tracking branch 'heroku/master'

* heroku/master:
  Add percentage of contributions from Oakland

Conflicts:
	assets/js/backbone.js
Merge remote-tracking branch 'heroku/master'

* heroku/master:
  Add percentage of contributions from Oakland
Merge remote-tracking branch 'upstream/master'

* upstream/master: