Upgrade to spec 3.0.0.beta1 (and related updates)

- Update spec_helper to match what is generated by rspec 3
- Run feature specs after non-feature specs (when invoking rspec)