Updated zsh files. Settings now in correct place

Also updates cleaning up the Makefile and xinitrc so it launches mate instead of
dwm.  This shouldn't be in this commit but I am feeling lazy!