minor changes to em restraint
Merge branch 'resolution-zero' of ssh://github.com/salilab/pmi into resolution-zero

Conflicts:
	pyext/src/restraints.py
Merge branch 'resolution-zero' of ssh://github.com/salilab/pmi into resolution-zero

Conflicts:
	pyext/src/restraints.py
	pyext/src/samplers.py
Merge branch 'resolution-zero' of ssh://github.com/salilab/pmi into resolution-zero
Merge branch 'resolution-zero' of ssh://github.com/salilab/pmi into resolution-zero
Merge branch 'resolution-zero' of ssh://github.com/salilab/pmi into resolution-zero
Merge branch 'resolution-zero' of ssh://github.com/salilab/pmi into resolution-zero
fixing em restraint to use new gaussian code