Merge remote-tracking branch 'cmr/various-cleanup' into incoming

diff --cc src/librustc/metadata/decoder.rs
Simple merge

diff --cc src/librustc/metadata/encoder.rs
Simple merge

diff --cc src/librustc/metadata/tydecode.rs
Simple merge

diff --cc src/librustc/metadata/tyencode.rs
Simple merge

diff --cc src/librustc/middle/trans/reflect.rs
Simple merge

diff --cc src/librustc/middle/ty.rs
Simple merge

diff --cc src/librustc/middle/typeck/check/mod.rs
Simple merge

diff --cc src/librustc/middle/typeck/infer/glb.rs
Simple merge

diff --cc src/libsyntax/ast.rs
Simple merge

diff --cc src/libsyntax/print/pprust.rs
Simple merge