Misc updates
Upgrade to RSpec 3.0.1