Merge branch 'master' of github.com:muran001/dotfiles
refactor setup.sj