Bug 659222: Fix branch prioritization. r=rail,bhearsum

Also, change default priority to 4, bump idle jobs to 6.