fix usage for import/gen-key, and remove revoker option from gen-key