Expandtab
Vim modeline tweaks
Better diffing