PEP8 Fixes
Merge pull request #228 from retornam/pepfix

PEP8 Fixes for all files