added z as submodule
differentiated between the expected dotfiles link and the actual dotfiles location
resolved conflicts