desktopcouch

Merge proposals dependent on lp://qastaging/~mandel/desktopcouch/fix_pep8_from_windows

  1. fix_pep8_from_windows
  2. Dependent merge proposals

lp://qastaging/~mandel/desktopcouch/fix_pep8_from_windows has no merge proposals.