Tidy up antfile and travis ci config