fixed 2d bug in scal
updates to gpupy
updates to gpupy