(wip) Update for Hspec 2.0

This are the changes needed for the upcoming Hspec 2.0 (don't merge yet!).