add more description to ergodic trim
Merge branch 'doc' of github.com:mpharrigan/msmbuilder

Conflicts:
	src/python/MSMLib.py
Fix typo.
Check for invalid lagtimes
Make sure inputted lag times are positive
Merge branch 'master' of github.com:SimTk/msmbuilder
Merge pull request #361 from mpharrigan/lagtime_check

Lagtime check
Merge pull request #364 from rmcgibbo/master

Update website to add citations
skip
Merge branch 'master' of github.com:SimTk/msmbuilder
Change the index page slightly. Bumping up the download link and adding a link to the mailing list
Merge branch 'master' of github.com:SimTk/msmbuilder
fix journal abbrevs
typo in index.rst
added TPT references to doc strings
typos