Move Travis configuration from incorrect place
Merge branch 'multi-project'