XTerm: internalBorder back to its default value

internalBorder=2 looks worse regarding "desktop design". It increases
readability, though.
Remove dwb stuff
Git: Use upstream colors (mostly)

- Git 1.8.4 enables a lot of coloring by default.
- Upstream colors are different from my colors: Changes to be committed
  are green, unstaged changes are red. This is indeed better and follows
  Gitk's colors.
- But untracked files are red, too. That's bad because it means you'll
  have to *read* the output of "git status". I'll keep them in cyan.