integrated CUDA-6-not-6.5-on-OS-X-with-clang fixes