Squashed commit of the following:

commit c13445e4105739dbc765a365bcf7cf4ab34bdcc6
Author: Tobba <a@a.a>
Date:   Mon Apr 7 23:20:52 2014 +0200

    Editor screwed up the indentation, whoops
Merge branch 'libflate-nofail' of https://github.com/Tobba/rust into libflate-nofail