Adding in long gap switching to 5 state model.
Merge branch 'em2' into nanoporeHacks