Merge pull request #668 from normanjaeckel/PEP8_2

Fixed Pep 8 Error
Update metafiles for new packaging style