merge travis-ci changes from github
Merge branch 'master' of github.com:talentdeficit/jsex