update to HEAD
auto merge of #621 : steveklabnik/cargo/update_to_head, r=alexcrichton

this just fixes the warnings with the replacements the warnings tell me to