Upgrade to RSpec 3.1

Hi Tien,

For your review. Let's hope I got it on the right repo this time.

Cheers!

E.