Refactored the Markov Model code to pass around CatalogContext handles as much as possible. Not sure if this will all work correctly. Still working on fixing the early 2PC optimization. #116