Use RSpec3 format stubs
Merge pull request #235 from tjchambers/master

Use RSpec3 format stubs