Rearrange vim sourcing so that highlighting kicks in