Updates to includes and travis config