Using the same namespace in cryptominisat.h, updating comphandler

Same namespace allows for smoother transition. Comphandler now uses
MainSolver which makes things a lot cleaner