Merge upstream f578aa0e2ca4af50750d04792646bc4c27cdd3c6 to fix issue discussed at http://forums.technicpack.net/threads/energy-no-longer-transmitted-in-build-craft-electrical-pipes.44674/#post-367907

Conductive pipes do not allow energy flow after a chunk is reloaded

Signed-off-by: nicolasi <github@nicolas.co.za>