Merge branch 'master' of https://github.com/nyangry/dotfiles
manual merge