updated to work with rust-dev changes
Update for rustc
Merge remote-tracking branch 'tomaka/master'