Fixes for NO_CUDA and Pragma Warnings
Merge branch 'master' into LaplaceSpherical2