ignore everything but master branch in travis
Merge branch 'master' into broken_i18n