Upgrade to RSpec 3

add the new rails_helper and use the new spec_helper