Various changes
Merge branch 'master' of github.com:qdw/qdw-dotfiles