Fix #432. Mistake was caused by oppacity bit in colour
Labelled a few peep variables. Added voucher type enum
Switched to no_of_rides instead of staff_type
Merge pull request #454 from duncanspumpkin/fix_432_and_peep

Fix #432 and a few more peep variables named