Rspec 3
All deprecation warnings gone

Syntax all fixed-up for rspec3
Merge pull request #33 from pikesley/rspec3

Rspec3