Fixes the vending machine bug?
Add the other shuttle controllers back in
Fixes janicart/segway
Mapfixes
Merge pull request #205 from ZomgPonies/master

15/06/14 - 2