checkpoint
Merge branch 'master' of https://github.com/jmullan/dotfiles
xdefaults tweaks