PEP 8 and list comprehension tidying up
Merge branch 'master' of https://github.com/andyeff/skybot