Merge pull request #92 from kyleabeauchamp/nk

Change numpy to np in mbar.py