Merge branch 'master' of github:alpaca-tc/dotfiles