Added back DATA to the client
Getting rid of TM_ in front of conf vars
Minor fixes
We sort the list of files in tar