Moved MSMLib import in msm_analysis, because those files import each other... which causes some issues.
Merge branch 'multi_ass_msm' of github.com:schwancr/msmbuilder into multi_ass_msm