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