Simpler travis for this branch. Do not merge travis file with master