Fix xvfb scripts
Merge branch 'bebanjo' into supervisor

* bebanjo:
  Fix xvfb scripts
Supervisord convention