cleanup and fixes for EM things
Merge branch 'master' of github.com:mattjj/pyhsmm