vim: bring back nowrap
xmonad: use named scratchpads again

- Minor whitespace fixes