More clustering changes/fixes
Changed hours to be averages/not absolute sum
Matplotlib fixes
Merge branch 'master' of github.com:bikecomps/simulation