pycharm into pep8

Looks like this branch was created after the merge of the pycharm file, not sure if you want to handle it like this or just rebase with master and push it.