Merge "Update the touch command to take a human readable timestamp"