Fixed some crashing issues with the command parser refactor.  Re-worked things to pass in current channel context so we can make command shortcuts.