Update make as well as travis config file