setup.sh initial and modify other dotfiles
Merge branch 'master' of http://github.com/amasho/dotfiles