Upgrade Rickshaw to 1.1.2
Merge pull request #1033 from erichiggins/rickshaw

Upgrade Rickshaw to 1.1.2