Merge branch 'master' into v2
Merge branch 'master' of https://github.com/zooniverse/Spelunker
Update Guardfile
Fix tools controller to not return data_source on updates