changed from chartjs to rickshaw
Merge branch 'rickshaw'