Cleaned up the attach_xvfb method

I still don't like the way display_reuse is handled.