Fix travis using consalidated branch from nbessi