Moved the MTS and aMD integrators to simtk.openmm

wrappers/python/simtk/openmm/__init__.py

@@ -20,6 +20,8 @@ if sys.platform == 'win32':
 
 from simtk.openmm.openmm import *
 from simtk.openmm.vec3 import Vec3
+from mtsintegrator import MTSIntegrator
+from amd import AMDIntegrator, AMDForceGroupIntegrator, DualAMDIntegrator
 
 if os.getenv('OPENMM_PLUGIN_DIR') is None and os.path.isdir(version.openmm_library_path):
     pluginLoadedLibNames = Platform.loadPluginsFromDirectory(os.path.join(version.openmm_library_path, 'plugins'))

wrappers/python/simtk/openmm/app/__init__.py

@@ -4,7 +4,7 @@ OpenMM Application
 __docformat__ = "epytext en"
 
 __author__ = "Peter Eastman"
-__copyright__ = "Copyright 2011, Stanford University and Peter Eastman"
+__copyright__ = "Copyright 2015, Stanford University and Peter Eastman"
 __credits__ = []
 __license__ = "MIT"
 __maintainer__ = "Peter Eastman"
@@ -30,8 +30,6 @@ from checkpointreporter import CheckpointReporter
 from charmmcrdfiles import CharmmCrdFile, CharmmRstFile
 from charmmparameterset import CharmmParameterSet
 from charmmpsffile import CharmmPsfFile, CharmmPSFWarning
-from mtsintegrator import MTSIntegrator
-from amd import AMDIntegrator, AMDForceGroupIntegrator, DualAMDIntegrator
 
 # Enumerated values