add np.seterr(invalid='ignore') around messages
since logaddexp(-inf,-inf) = -inf is totally cool
pull in updates/fixes from separate-trans branch
Merge branch 'master' of github.com:mattjj/pyhsmm
make heldout_state_marginals work again
Merge branch 'master' of https://github.com/mattjj/pyhsmm
add GeoHSMMStates E_step (most of one anyway)
fix broken HMM EM
fix broken EM and Viterbi EM
If duration probabilities are all zero, pick the first one (helps with long changepoints)
cleanup and fixes for EM things
Merge branch 'master' of github.com:mattjj/pyhsmm
joblib resampling should set log_likelihood
another hsmm joblib fix
add comment explaining _kwargs member
get rid of stateseq dummies, use 'generate' keyword
Update pybasicbayes
Merge branch 'master' into separate-trans

Conflicts:
	internals/hsmm_states.py
	internals/initial_state.py
	models.py
	parallel.py