Adjusted travis, fixed some headers