fixed style to conform to PEP8
Merge branch 'master' of https://github.com/celttechie/sqlalchemy

Pulling from new fork of SQLAlchemy