Auto-Enchanter improvements.
Base framework for renaming machines via anvil
Remove dead constructors
Merge pull request #222 from skyboy/original

Machine changes
Merge remote-tracking branch 'upstream/master'