Add stuff about macaroons (from Robert Escriva)