Starting to make a file upload api
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
Add notice and alert flashes to the application layout.
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 problem
Final changes to flashes before pull
Fixing tests to suit new csv upload system
Trying to get travis to run again
Damn ICONV was deprecated in ruby 2.0.0
Merge branch 'master' of git://github.com/isenseDev/rSENSE into fileupload
Merge branch 'fileupload' of github.com:jdalphon/rSENSE into fileupload
Cleaning up names of functions and js
Test update