str::from_utf8() now returns an Option
"do" is gone
Merge pull request #25 from jedisct1/erickt-rebase

Minor changes for rust -master