Remove pickling from json_wrap.py
Removing import used only by what was removed in the last commit
Merge branch 'master' into introduce_testing