Ore Dictionary compatibility

Changed some recipes to use the Ore Dictionary. Made shapeless
recipes use the Ore Dictionary. Also implemented the changes that CJ
asked for.

If there was another PR like this one(Not counting #1227, #1232, and
#1234), I would like to know why not?
Merge pull request #1239 from CaptainShadows/master

Ore Dictionary compatibility
Fix for Pumps

Closes #1224
Merge branch 'master' of https://github.com/BuildCraft/BuildCraft
Merge pull request #1 from BuildCraft/master

Upstream