Update travis config to use X11
Merge branch 'master' into issue24

* master:
  Update travis config to use X11