fixed spot_form tests when the spot specified in local_settings is not the default spot
Merge branch 'uiuc_merge' of git://github.com/abztrakt/spotseeker_server into uiuc_merge
Merge branch 'uiuc_merge' of git://github.com/abztrakt/spotseeker_server into uiuc_merge
Merge branch 'uiuc_merge' of https://github.com/swansong/spotseeker-server into uiuc_merge