Changed setup process
Merge branch 'master' of github.com:cjmatta/dotfiles