Require not used in class.
Clean up controller action a bit. I think it could take more, but
I'm not sure how yet.
Redisplay form for submitting CVS after success.
Asynchronous csv people importing works here.
update changes
Replace rxml with builder.
Make work subclass views explicitly use the .html.haml layout
Fix bug when work['abstract'] is nil.
Fixed some tests.
Add daemons gem to gemfile.
Do something reasonable if encoding issues make the links
impossible to embed.
Merge branch 'master' into uiuc-connections

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/people_controller.rb
	app/controllers/works_controller.rb