Merge branch 'master' of github.com:c-14/dotfiles