Gregtech updates, Logistics Pipes power usage disabled, NEIAddons bee combs

GT configs updated for new blocks/items. Re-added quarry nerf.
Logistics Pipes power usage disabled. NEIAddons comb indexing in NEI
enabled.
Merge remote-tracking branch 'upstream/master'