Merge branch 'master' of github.com:creasty/dotfiles