Update some of the test dependencies
Switch to separate spec_helper and rails_helper.

This follows what RSpec3 generates when being setup on a new project.
Put all integration specs in the same place

Also name the files more clearly.