Makefile CUDA: Add natural path to nvcc with an NVCC macro,
and make the OSX -ccbin quirk a macro too.

Merge some other stuff from bleeding-jumbo too.