Changes to support RSpec 3
Merge pull request #31 from terrellt/feature/RSpec3

Changes to support RSpec 3