Update travis.yml
DRY up the marshalling code