Upgrade to RSpec 3.1
merged master to allow automerge
Merge pull request #3 from tienyuan/rspec-upgrade

Upgrade to RSpec 3.1