Made vending machines less of a PITA.
Merge pull request #166 from N3X15/Bleeding-Edge

Made vending machines less of a PITA.