Revert back to Reader as it's a little easier to use here.
Update to rust 0.9-pre (a5fa1d)