Make compatible with grape 0.9.1

Fairly self explanatory. Seems to work fine. Note that the master branch of grape has some bugs of its own, which I have also made a pull request against.