Merge pull request #1 from joshiejack/master

Ketchup
Department of Redundancy Department
Orechid Support
Infusion Enchantment Removal
Research Shenanigans
Merge pull request #6 from SpitefulFox/master

Botania + Thaumcraft Fun