fix travix make targets
Merge branch 'maint'