2.0 beta
Merge branch '2.0' of https://github.com/fffonion/RoameBot.git into 2.0
Merge branch '2.0'