Merge pull request #860 from sol/master

Forward compatibility with Hspec 2.0
Update for Hspec 2.0
Temporarily use install Hspec from GitHub