changed pyext/src/macros.py and pyext/src/output.py
changed pyext/src/macros.py pyext/src/output.py pyext/src/sandbox.py
adding MD option to samplers
adding charmm restraint, spherical gaussian
spherical gaussian for all atom restraint
adding MD option to macro ReplicaExchange0
Merge Charles's changes to master into develop

Conflicts:
	pyext/src/macros.py