Some general fixes.

Sorry, CovertJaguar, I still have some more fixes and maybe more later.

For now, these changes fix this:
AW works with items with NBT data
AW now works better with items that have a container.
Also some cleanups.

AW meaning auto workbench
Merge pull request #796 from Need4Speed402/patch-2

Some general fixes.