[MERGE] Switch nick too

[John Arbash Meinel]

John Arbash Meinel has voted comment.
Status is now: Semi-approved
Comment:
I think Robert's comment was that we should be looking at 
self.get_master_branch().nick all the time. Or at a minimum, we 
shouldn't be hard-coding the nick when it isn't appropriate.

Certainly this might do weird things with looms, but I think they 
intercept the switch command anyway.

I won't block or approve, until Robert comments.

For details, see: 
http://bundlebuggy.aaronbentley.com/project/bzr/request/%3C418c22640807222226s7c2a544n2d34469a2c3e91a1%40mail.gmail.com%3E
Project: Bazaar