Stuff
Merge branch 'master' of github.com:JGrubb/hobo-companion

Conflicts:
	app/assets/javascripts/hobo-charts.js.coffee