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

Conflicts:
	pymbar/mbar.py
Merge pull request #100 from mrshirts/nk

Fixes for general expectation computation.