Upgrade to rspec 3; fix deprecations; closes #678