Rebase merge conflic resolution

Conflicts:
	Mixtape/markovstatemodel.py
Cache eigen calculation