Fixing bugs and simplifying the 5-state model to get better EM
convergence.
Merge branch 'em2' into nanoporeHacks