Merge branch 'master' of /git/dotfiles/scripts