Importing new version of CMS2

Importing new version of CMS2

* bug with Conglomerate fixed. Conglomerate will in the future be
  callable in the middle of solving
* variable activity is now uint32_t. No more floating point code.
  This change also means a more conservative variable activity
  heuristic. Should help on most problems (but not crypto, I
  believe)
* Removed useless code around logging
* No more warnings on (deprecated) const char* to string conversion

git-svn-id: https://stp-fast-prover.svn.sourceforge.net/svnroot/stp-fast-prover/trunk/stp@687 e59a4935-1847-0410-ae03-e826735625c1