Auto merge of #2634 - frewsxcv:flake8, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 3 May 2016 17:59:34 +0000 (10:59 -0700)
committerbors <bors@rust-lang.org>
Tue, 3 May 2016 17:59:34 +0000 (10:59 -0700)
Address flake8 issues.

None


Trivial merge