NEI magics
Merge pull request #293 from way2muchnoise/1.7-update

NEI magics