Rspec 3 syntax

This uses the new rspec 3 syntax so you can avoid those lovely deprecation warnings.