Starting to make a file upload api
Migrate media data off S3.
Handle spaces in image file names.
Add loop for content patches.
Create media objects and saved vis's. Delete media objs.
Merge branch 'master' of git://github.com/isenseDev/rSENSE into fileupload
More work towards non-ajax csv upload
Re-integrating google docs.
Merge branch 'fileupload' of github.com:jdalphon/rSENSE into fileupload
Added a to_csv function to the dataset model. This will be useful for export (which is being redone next)
Merge branch 'master' of git://github.com/isenseDev/rSENSE into fileupload
Merge branch 'fileupload' of github.com:jdalphon/rSENSE into fileupload
Handle null thumb id.
Add notice and alert flashes to the application layout.
Properly generate thumbnail MOs for Vis.
Make tests pass.
Cleaned up the exporting process, fixed a bug that may never have actually been found
Merge branch 'restore-ui-flash' of https://github.com/NatTuck/rSENSE into fileupload
Merge branch 'master' of https://github.com/isenseDev/rSENSE into kill-amazon-phase-1

Conflicts:
	app/controllers/application_controller.rb
	app/views/layouts/application.html.erb
Finish merge.