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