Use standard display-buffer [#261]

Our custom display logic was a pretty nice mess, and broke other
packages such as popwin.