Merging master
Merge branch 'master' of git://github.com/isenseDev/rSENSE into gpx
Pulling to hopefully fix Nat and Skittles aweful
Merge branch 'master' of git://github.com/isenseDev/rSENSE into gpx
Fixing a bug with file upload and adding ability to upload gpx files.
Run travis run
Adding functional test for uploading a csv
Merge branch 'master' of git://github.com/isenseDev/rSENSE into gpx
Hiding file upload field
Adding rescue back to datafileupload
Merge pull request #997 from jdalphon/gpx

Bug fix and GPX
Merge pull request #999 from jdalphon/add-tests

Added functional test for dataFileUpload
Changing create project button to a button instead of an isotope element
Updating tests to click new button
We can edit fields again
Fixed problem with deletion of data sets
Updating dataset destroy test
Turning off aweful inline editing for ckeditor. Removes aweful padding with it
Merge pull request #1000 from jdalphon/projects_page

Change to add project button
Merge pull request #1002 from jdalphon/fields

We can edit fields again