Now we're on Rails 4.
Clean up some tests.
Merge branch 'master' of https://github.com/isenseDev/rSENSE into rails-4
Clean up tests - skip stuff Jim is breaking.
Maybe it passes tests now?
Merge branch 'master' of https://github.com/isenseDev/rSENSE into rails-4

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/data_sets_controller.rb
	app/views/projects/show.html.erb
	config/routes.rb
Merge branch 'rails-4' of github.com:NatTuck/rSENSE into rails-4

Conflicts:
	app/assets/javascripts/application.js
	app/views/home/index.html.erb
Merge pull request #983 from NatTuck/rails-4

Now we're on Rails 4.