merge fixup_phis and join_blocks

[dcbaker]

fixing up the phis is something that basically always need to happen when two blocks are joined (assuming there are phis), so just combine them into one pass.