Merge "Add -F for classify to ls"