Merge pull request #13 from d3athrow/Bleeding-Edge

Bleeding edge
Update vending.dm
Merge pull request #1195 from Heredth/hotfix2

Hotfix2