minor changes to xray
Merge branch 'master' of github.com:tjlane/odin
yaml for travis