Upcase ERRAND in Org settings
Don't schedule captures by default
Update TODO colors

These are not close to perfect, but work a bit better on my dark
background than johnw's defaults did.
Get rid of a stray johnw setting
Update magit diff and highlight colors
Choose more subtle whitespace mode colors

I want to leave it turned on, but between other programmers at work and
using some of johnw's emacs config there are too many whitespace
highlights and I only want to see them, when I'm really looking for
them.