merge stuff from zendesk

just to keep this dumb repo somewhat up to date