fixing bug with RootbeerGpu.getBlockDimx/getGridDimx
Merge branch 'master' of git://github.com/pcpratts/rootbeer1 into develop

Conflicts:
	src/edu/syr/pcpratts/rootbeer/generate/opencl/CudaHeader.c