Bug fixes for pickle file generation
Another bug fix for getting pickling working for the GPU solver - 3rd party library (pyOpenCL) objects don't allow it