merge w conflicts in cuda init and nvcc_compiler - I had to clobber my previous commits which were bad