Some more pyflakes3 and pep-8 warnings

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Fix the remaining pyflakes3/pep-8 issues

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Merge pull request #7 from stgraber/master

Some more pyflakes3 and pep-8 warnings