Fixes for buildbot (whitespace, unused imports etc.).
Merge pull request #70 from xor-xor/fix_bb

Fixes for buildbot (whitespace, unused imports etc.).