revert last changes to cdabot / us.py (nickname, urlshortener service)