Normalize rspec syntax to remove deprecation warnings
Merge branch 'master' into rspec-deprecations
Merge pull request #26 from DanOlson/rspec-deprecations

Normalize rspec syntax to remove deprecation warnings