use IntMap
Merge with 'master' & use IntMap

Conflicts:
	Satchmo/Core/SAT/Minisat.hs
adjust version number