#335 NPE with TE machines and EIO item conduits.
#363 Factorization barrels not updating display when items removed.
Merge branch 'master' into 1.6.4