All working.
Now allows different 3 and 5 state models to be specified.
Merge branch 'em2' into nanoporeHacks