Changed back changes in rickshaw.js
Reverted some more changes in rickshaw.js