Revert demo-data change, fix Travis config, refs T160