[MERGE] clean up option.py and branch.py imports

[Michael Hudson]

Alexander Belchenko wrote:
> Alexander Belchenko has voted approve.
> Status is now: Approved
> Comment:
> good.
> 
> For details, see: 
> http://bundlebuggy.aaronbentley.com/request/%3C47C4A6D2.7080508%40canonical.com%3E 
> 
> 

Can you merge the branch then?

Thanks in advance.

Cheers,
mwh