Priority e2e

@katowulf - lots of changes here. Please give this a once over and then merge. All e2e tests are now running and passing consistently locally. There is one priority-related test which fails and I think it's actually a bug. I'm skipping that one for now and will discuss it with you tomorrow.

If I had to bet, this is going to still fail in Travis (for a yet unknown reason). Tomorrow is the day I get Travis working consistently!