stripped more stuff out, added xterm for apt-get progress, integrated oh-my-zsh