Remove extra::par fixes #5626
fix merge conflicts due to bit rot
Merge branch 'incoming' of git://github.com/mozilla/rust into removePar
use iterators
more merge conflicts
auto merge of #7034 : nickdesaulniers/rust/removePar, r=brson

review? @brson