Rebase merge conflic resolution

Conflicts:
	Mixtape/markovstatemodel.py
Cache eigen calculation
Merge pull request #187 from mpharrigan/vectors

Cache eigensystem