Cleanup of covariance estimators.
Fix O(N^2) bug #106 in old_pymbar.py
Merge pull request #115 from kyleabeauchamp/cleanup_covar

[WIP] Cleanup of covariance estimators.
Merge remote-tracking branch 'upstream/nk' into fft2