Merge pull request #5 from Foggalong/master

PEP 8, Organisation, and Sane Updater
comments in a pythonic manner
Merge pull request #2 from nixers-projects/master

Pull in upstream