update badass.y
Merge branch 'master' of https://github.com/Wadjetz/Badass