Fix rspec deprecation warnings
Use rspec's `hash_including` if available
Merge pull request #320 from tamird/fix-hash_including

Fix hash_including for rspec 1