Merge branch 'develop' of https://github.com/yeahwhat-mc/CloudBot into develop