Spring cleaning
more spring cleaning
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)>
Trying to make travis rerun
A fix for issue #861
Fixing failing tests due to different states of the dbs
Merge pull request #862 from jdalphon/generalChanges

Spring cleaning. Removing unused files
Merge pull request #863 from jdalphon/jd_issue861

A fix for issue #861
merge conflicts