more refactoring of commands
Merge branch 'refactor' of https://github.com/BuddaT/BungeeSuite into refactor