Fix indentation warnings, sort by directory first.

- Indentation fixes to remove warnings.
- Cosmetic changes formatting.
- In dired, always sort by directory first.