pep8 compliance

Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
Merge pull request #43 from battlemidget/patch-pep8-fixes

Patch pep8 fixes