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?
clickable cards on home page, no hover effect on non-clickable cards, bold featured on project and vis indexes
made news index page pretty
Merge pull request #984 from nickavv/parachute

Prettification and consistencification
Merge pull request #985 from jdalphon/fields

Fields overhaul
-Added top-level alert for browsers that don't support svg (good indicator of bad vis support).
-Fixed copypasted comment.
Merge pull request #986 from mmcguinn/mm947

-Added top-level alert for browsers that don't support svg (good indicator of bad vis support).
Merge pull request #988 from jdalphon/fields

Fixing file upload bug
-Made map type get saved for saved vis.
-Fixed unsupported browser dection for embedded views.
-Turned off debug mode for browser svg support detection (was reversed).
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
-Fixed off-by-one errors for date parsing.
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.
Correct application.js