Upgraded to rspec 3 and updated specs.
Updated travis.yml
Merge pull request #47 from jimmybaker/rspec-upgrade

Upgraded to rspec 3 and updated specs.