support for CUDA 6.0
Merge branch 'master' of git://github.com/pcpratts/rootbeer1 into develop