IC2,Forestry,Railcraft conflics
Merge branch 'client' of https://github.com/Thronk/venus

Conflicts:
	config/GregTech/DynamicConfig.cfg
	config/IC2.cfg
	config/InvTweaks.cfg
	config/NEISubset.cfg
	config/forestry/apiculture.conf
	config/forestry/backpacks.conf
	config/forestry/common.conf
	config/forestry/gamemodes/EASY.conf
	config/forestry/lepidopterology.conf
	config/forestry/pipes.conf
	config/railcraft/railcraft.cfg
Merge branch 'client' of https://github.com/Thronk/venus
merge
engine conflict