Fix version issue
Merge pull request #99 from rmcgibbo/fix-version-issue

Fix version issue
Fixes for general expectation computation.
Merge remote-tracking branch 'upstream/nk' into nk

Conflicts:
	pymbar/mbar.py
Refactored tests
Tiny change to docstring
Merge pull request #101 from choderalab/refactor_tests

Refactored tests, added test for computeGeneralExpectation bug
Merge pull request #100 from mrshirts/nk

Fixes for general expectation computation.
Merge remote-tracking branch 'upstream/nk' into simplernk
Merged in MRS changes to computeGeneralExpectations in my old_mbar.py