auto merge of #1247 : saneyuki/servo/rename, r=metajack

@metajack ?

src/components/main/layout/layout_task.rs

@@ -7,7 +7,7 @@
 
 use css::matching::MatchMethods;
 use css::select::new_stylist;
-use layout::aux::LayoutAuxMethods;
+use layout::extra::LayoutAuxMethods;
 use layout::box_builder::LayoutTreeBuilder;
 use layout::context::LayoutContext;
 use layout::display_list_builder::{DisplayListBuilder};

src/components/main/servo.rc

@@ -92,7 +92,7 @@ pub mod layout {
     pub mod text;
     pub mod util;
     pub mod incremental;
-    mod aux;
+    mod extra;
 }
 
 pub mod windowing;