Merge branch 'master' of https://github.com/otters/dotfiles