Upgrade rust.
Address review comments.
Update to merged commits in submodules.
Fix tests.
auto merge of #2041 : mozilla/servo/rustup_20140321b, r=larsbergstrom