Rebase code and update BAOAB naming

plugins/drude/tests/TestDrudeSCFIntegrator.h

@@ -127,6 +127,8 @@ void testWater() {
         for (int j = 1; j < (int) force.size(); j += 5)
             norm += sqrt(force[j].dot(force[j]));
         norm = (norm/numMolecules);
+        // Just to see what's going on with Travis.  Remove later!
+        if(norm < maxNorm) { printf("norm: %8.2f, allowed %6.2f\n", norm, maxNorm); }
         ASSERT(norm < maxNorm);
     }
 }

tests/TestLangevinMiddleIntegrator.h

@@ -278,7 +278,7 @@ void testInitialTemperature() {
         positions[i][2] = genrand_real2(sfmt);
     }
 
-    BAOABLangevinIntegrator integrator(300, 25, 0.001);
+    LangevinMiddleIntegrator integrator(300, 25, 0.001);
     Context context(system, integrator, platform);
     context.setPositions(positions);
     context.setVelocitiesToTemperature(targetTemperature);