Added SWAP to ISWAP gate conversion in resolve_gates

Also fixed some errors in the docstring and indentation.