add parallelization note
tweaks
Merge branch 'master' of github.com:slinderman/nb_spiketrains

Conflicts:
	cosyne/hippocampus_hmm_er.py
add rho > 0. check