made file download page prettier
Spring cleaning
Merge branch 'master' of https://github.com/isenseDev/rSENSE into parachute
more spring cleaning
made home page vis not overrun boundary
Merge branch 'master' of git://github.com/isenseDev/rSENSE into generalChanges
Destroying a scaffold broke some of the routes
Even more spring cleaning

Signed-off-by: jdalphon <jdalphon@jdalphon-dev.(none)>
Merge branch 'master' of https://github.com/isenseDev/rSENSE into parachute
Trying to make travis rerun
A fix for issue #861
new non-svg icons, and a new manual entry icon
Fixing failing tests due to different states of the dbs
Merge pull request #862 from jdalphon/generalChanges

Spring cleaning. Removing unused files
Correctly disabling the reset button initially and removing some variables that are duplicates of other variables
Merge pull request #863 from jdalphon/jd_issue861

A fix for issue #861
merge conflicts
Merge remote-tracking branch 'upstream/master' into jp751
Upload from Google Doc now gives name box
Merge pull request #856 from nickavv/parachute

A bunch of stuff