Update dependencies
auto merge of #655 : ebfe/cargo/deps, r=alexcrichton

At least rust-encoding needs updating to compile with rust master.