Merge branch 'optimize-grid-particle' into exp_config

Conflicts:
	src/ComputeForce.cu
	src/ComputeGridGrid.cu
	src/ComputeGridGrid.cuh
	src/GrandBrownTown.cu
	src/Makefile
	src/RigidBody.cu
	src/RigidBody.h
	src/RigidBodyController.cu
	src/RigidBodyController.h
	tests/argon-small/BrownDyn.bd
	tests/argon/BrownDyn.bd