Merge pull request #74 from battlemidget/master

pyflakes you make me angry