Check for both simplejson and json at the same time.
Check for both simplejson and json at the same time.

This avoids accidentally failing simply because 'simplejson' isn't
available (but 'json' might be, but we aborted too early)

This fixes tests broken by the previous commit.

virtkick/fpm,fetep/fpm,dischord01/fpm,pskrz/fpm,gearmover/fpm,snailwalker/fpm,elvido/fpm,virtkick/fpm,Tapjoy/fpm,schatt/fpm,tjyang/fpm,joseph-onsip/fpm,dischord01/fpm,Tapjoy/fpm,dischord01/fpm,jerizm/fpm,mildred/fpm,joseph-onsip/fpm,snailwalker/fpm,snailwalker/fpm,godp1301/fpm,mzaccari/fpm,sideci-sample/sideci-sample-fpm,mildred/fpm,paul-krohn/fpm,wyaeld/fpm,jerizm/fpm,vi4m/fpm,doghrim/fpm,dischord01/fpm,tjyang/fpm,rbramwell/fpm,rbramwell/fpm,pskrz/fpm,mzaccari/fpm,josephfrazier/fpm,paul-krohn/fpm,hlawrenz/fpm,mildred/fpm,josephfrazier/fpm,josephfrazier/fpm,linearregression/fpm,virtkick/fpm,gearmover/fpm,snailwalker/fpm,schatt/fpm,gearmover/fpm,godp1301/fpm,josephfrazier/fpm,joseph-onsip/fpm,wyaeld/fpm,wyaeld/fpm,pskrz/fpm,godp1301/fpm,paul-krohn/fpm,virtkick/fpm,fetep/fpm,mzaccari/fpm,sideci-sample/sideci-sample-fpm,rbramwell/fpm,fetep/fpm,cturra/fpm,linearregression/fpm,pskrz/fpm,schatt/fpm,cturra/fpm,gearmover/fpm,vi4m/fpm,schatt/fpm,jerizm/fpm,joseph-onsip/fpm,rbramwell/fpm,vi4m/fpm,linearregression/fpm,elvido/fpm,hlawrenz/fpm,godp1301/fpm,mildred/fpm,cturra/fpm,mzaccari/fpm,vi4m/fpm,paul-krohn/fpm,elvido/fpm,Tapjoy/fpm,doghrim/fpm,doghrim/fpm,linearregression/fpm,cturra/fpm,hlawrenz/fpm,fetep/fpm,jerizm/fpm,doghrim/fpm,hlawrenz/fpm,sideci-sample/sideci-sample-fpm,elvido/fpm,wyaeld/fpm,Tapjoy/fpm,tjyang/fpm,tjyang/fpm