pep8 fixes
Fixed a messed up merge in gridlayout.py
Merge pull request #1532 from inclement/pep8_fixes

Pep8 fixes