I've had good luck with an IOGear DisplayPort KVM. I would also like the two items merged. As it stands, I'm already in the process of making a new desk-top (like the wood on top of the legs, not like another computer), and I plan to give these items their own space on the underside of the desk top, either on shelves or with some other mounting mechanism.

You can see the major layout here (just listing the connectivity): https://news.ycombinator.com/item?id=25522719