Determine DOTFILES_ROOT correctly
Merge branch 'fixroot'