[MERGE] Refactor cmd_serve to a be easier to extend.

[John Arbash Meinel]

John Arbash Meinel has voted approve.
Status is now: Approved


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