Fix some formatting for pep8 compliance
Merge branch 'master' of git://github.com/CTPUG/wafer