Flatten item conduits in prep for review and merge.
Cleanup after merge. Added new back and top textures for machines.
Merge branch 'master' into 1.6.4