Merge pull request #707 from progwml6/master

Configuration file compatibility for 1.6.4 and 1.7.2
Change FluidType to a more appropriate class
Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct