Tweaks to the Global, World, and Setup files.
Merge branch 'master' of https://github.com/RBMNT/RBstation2