Upgrade to use rspec 3
Merge pull request #3 from hatoishi/master

Upgrade to use rspec 3