clean up
Add rickshaw
Change flotr2 to rickshaw