Merge bzr.dev and resolve conflicts.
Final review comments.
Fixed the output in the tests.
Show examples, and change text to use double rather than single quotes.
Remove the whitespace fix ups that shouldn't be there.
Use the exception text for unalias not found.
Updates from Aaron's review.
Removed the unalais separate command.