Updates to integrator.

Old code was doing things out of order, but I had never gone
back to check it after it was written.  Integrator seems more
stable now and should be doing things in the order that the
CHARMM VV2 integrator is.

Change-Id: I9130023c2e22b7c69b7a6a9a49e6d5d4fb80567c