upstream merge

fixes some key bugs with Slack's message format and the `shorten` command