Parsing fixes, merge issue

• Fixing issue where merge command was not deleting posts in channels
• Location parsing improvements
• Join parsing improvements
• Now handling @Nickname mentions properly