General tweaks
Merge branch 'master' of github:cglosser/Dotfiles