Make the graph not look horrific
Merge remote-tracking branch 'heroku/master'

Conflicts:
	app/assets/javascripts/index.js.coffee
Gemfile.lock update
return values...
Add vitals