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
Merge remote-tracking branch 'upstream/nk' into simplernk