updating oh-my-zsh
updating to vundle
adding auto ls
updating merge conflicts