Duplicity

Merge proposals dependent on lp:~aaron-whitehouse/duplicity/fix_POTFILES.in_and_run-tests

  1. fix_POTFILES.in_and_run-tests
  2. Dependent merge proposals

lp:~aaron-whitehouse/duplicity/fix_POTFILES.in_and_run-tests has no merge proposals.