Use new expect syntax
Update specs to new syntax as well
merge with origin/master
Merge pull request #113 from acrmp/new_expect_syntax

Use new rspec expect syntax