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