Updates build and fixes travis config