Rails update

update to rails 3.1, devise 2.0, more current jquery. Also, a bit of
javascript cleanup.
More gem updates
Merge branch 'master' into rails_3_1
Merge branch 'master' into rails_3_1
Merge branch 'master' into rails_3_1
Update devise and exception_notification
Merge branch 'master' into rails_3_1

Conflicts:
	Gemfile.lock
	db/schema.rb
Update Gemfile.lock
Trip import: fix for tempfile path
Add Autosizing for text areas
Add autosize to certain textareas
Default javascript: js suffix not needed
Add autosize to textareas throughout