Revert "Merge branch 'master' of git://github.com/dmorse/simpatico"

This reverts commit b092fd5a8bbfc083afb13af7954866a54b5e9955, reversing
changes made to bae0a838ad892091b2a6cecad3cc85444d81752d.

Conflicts:

	lib/.gitignore
	src/inter/external/OrderingExternal.cpp
	src/inter/external/OrderingExternal.h