Test fixes and rebase conflicts

Author: alexcrichton

src/libstd/rand/os.rs

@@ -22,7 +22,7 @@ mod imp {
     use rand::Rng;
     use rand::reader::ReaderRng;
     use result::{Ok, Err};
-    use slice::{ImmutableSlice, MutableSlice};
+    use slice::SlicePrelude;
     use mem;
     use os::errno;
 

src/libunicode/tables.rs

@@ -10,7 +10,7 @@
 
 // NOTE: The following code was generated by "src/etc/unicode.py", do not edit directly
 
-#![allow(missing_docs, non_uppercase_globals, non_snake_case)]
+#![allow(missing_docs, non_upper_case_globals, non_snake_case)]
 
 /// The version of [Unicode](http://www.unicode.org/)
 /// that the `UnicodeChar` and `UnicodeStrPrelude` traits are based on.