Forgot to ever merge these

Contains a bunch of random commits. Most majorly, work on the new machine system. Added some basic items to help with testing the alloy system and making machines out of any material. Unfinished, but the game will run. 
TEXTURES NEEDED!