Merge branch 'master' of github.com:yosemitebandit/traveler

mhm
Merge branch 'master' of github.com:yosemitebandit/traveler