Rebase merge conflic resolution

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

Cache eigensystem
Update docs a little

Conflicts:
	Mixtape/markovstatemodel.py
Rename so we can have multiple score functions
Merge pull request #171 from mpharrigan/msmscore

Add score to MarkovStateModel
Merge branch 'master' of https://github.com/rmcgibbo/mixtape into Refactor