make heldout_state_marginals work again
Merge branch 'master' of https://github.com/mattjj/pyhsmm