Merge proposals dependent on lp:~soren/surveilr/pep8-fixes

lp:~soren/surveilr/pep8-fixes has no merge proposals.