Repairing the X display check.

USERNAME isn't always set; USER is probably more common.
Merge branch 'master' of github.com:eswald/dotfiles
Consistent permissions mask.
Merge branch 'master' of github.com:eswald/dotfiles
WPAD file type.