Merge Salim & Jay's transport work, plus Chris's spec fixes

`test-kitchen:merge-transport` is branched off master 3d5e5d74ab2418b743b63d71f8fd2fd985e1f000 on 12/3, meant to gather everyone's work into one fork.