"Completed" simulation.

After further refactoring, I've merged the diffusion
sim back into the rest, and fixed what remained for the
grid updates to be safe. No doubt there are bugs lurking
here, but in theory I believe the physics simulation portion
is now complete.