try to get travis started
Merge branch 'master' into tresata