Peg rspec to latest 2.x version
Merge branch 'master' of github.com:mortardata/mortar