how do I restore my mac to how it was before this impromtu disk swap?
Install OS X.
Make sure both Mac are connected together, that can be network or Firewire.
When you first start and the message pops up about do you wish to restore from another Mac, answer yes.
That will invoke Setup Assitant which is actually easier to use then Migration Assistant.
Retrieving data ...