Update Monkey conventions, fix Wait extension method
Merge branch 'master' of https://github.com/patrickherrmann/Bumblebee