Fix dotfiles source path in setup.sh
Merge branch 'e3'