Merge pull request #55 from boudewijn-tribler/code-cleanup

Conform to pep8 rules.