pep8 error
Code Cleanup
Merge remote-tracking branch 'flexget/master'
Merge remote-tracking branch 'flexget/master'
Merge pull request #26 from crawln45/master

code cleanup