correct order for dependencies
Merge branch 'travis'