Updated to be essentially working mapping of u_kln to u_kn.
Added a test script that works with the updated u_kln->u_kn code.
Manually adding a change to make manual merging easier.
resolving issues between master and nk, all in pymbar/__init__.py
Address a number of issues raied with the pull request.
Merge pull request #83 from mrshirts/nk

Extensive conversion from u_kln->u_kn formalism.  Still need to debug `import version` issues with travis-ci.
Change numpy to np in mbar.py
Merge pull request #92 from kyleabeauchamp/nk

Change numpy to np in mbar.py
Fixed some import errors and moved harmonic_oscillators_update.py to a better location
Merge pull request #97 from choderalab/nkfix

Fixed some import errors and moved harmonic_oscillators_update.py
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 pull request #111 from choderalab/nk

Create branch nk_shirts to hold backup of nk