Taher
Taher
Merge branch 'devel' of https://github.com/TaherGhasimakbari/simpatico into devel
Taher
Taher 7-15-2013
Dave back and forth merge.
Merge branch 'devel' of https://github.com/TaherGhasimakbari/simpatico into devel
Removing *.d and *.o files added by Taher.
Merge remote-tracking branch 'dmorse/devel' into devel
Merge branch 'master' of https://github.com/dmorse/simpatico into devel
Taher Ghasimakbari
Taher
Taher
Merge branch 'devel' of http://github.com/TaherGhasimakbari/simpatico into devel

Conflicts:
	.gitignore
	src/mcMd/diagnostics/mcSystem/McChemicalPotential.cpp
	src/mcMd/diagnostics/mcSystem/McChemicalPotential.h
	tools/cpp/chainMaker/in.L8
	tools/python/TextWrapper.pyc
	tools/python/makeDepend.pyc
Taher
Change to gitignore
Temporarily commented out setEta in NPTMTKMove (disabled)
Merge branch 'devel' of https://github.com/TaherGhasimakbari/simpatico into devel

Conflicts:
	.gitignore
NVTChemicalPotential add to sources.mk
.gitignore modified and simpatico/src/mcMd/diagnostics/mcsystem/sources.mk also midified not to include McChemicalPotential.h
Hopefully, I got rid of all junks! Now on only good files will be tracked.
I changed the McDiagnosticsFactory.cpp_r to include the McNVTChemicalPotential.h.