Auto merge of #2653 - frewsxcv:cleanup, r=alexcrichton
authorbors <bors@rust-lang.org>
Fri, 6 May 2016 16:19:36 +0000 (09:19 -0700)
committerbors <bors@rust-lang.org>
Fri, 6 May 2016 16:19:36 +0000 (09:19 -0700)
A few cleanup commits.

None


Trivial merge