Fixed NEI (please don't murder me please)
Merge branch 'master' of https://github.com/Flaxbeard/SteamCraft_1.7