Update for rust changes
Merge branch 'master' of github.com:am0d/rust-web