Reverted master to pre-hmm changes (this commit: 46f97b51d0250faf48279b186dc79af0de7a1fbc). Followed
the instructions given here: http://stackoverflow.com/questions/2763006/change-the-current-branch-to-master-in-git
and created a new branch (hmm_merge_fix) with the correct code. Merging that branch back into master.