fix for #33 - make sure Xvfb is running before returning control to the program
Merge branch 'wait-for-xvfb-to-launch'

Conflicts:
	lib/headless.rb