fix travix make targets
Merge branch 'maint'
Merge branch 'maint' of github.com:magit/magit into maint
Merge branch 'master' of github.com:magit/magit
Merge branch 'maint'