merge Spider into master

Merge branches before making minor changes (e.g., updating json files / repo to deal with spider issue #1) so this doesn't have to be done twice