NEI Merge
Merge branch 'MC_1.5.2' of https://github.com/CrazyPants/EnderIO into MC_1.5.2
Revert "Made the recipes file a bit cleaner and ported Unrepentant-Atheist changes."

This reverts commit cde0b60fbf19c5f231d498f428ff2a8274b4c3e0.