updates
removed oh my zsh
removed all oh my zsh info
added back the custon oh-my-zsh scripts
removed old icons
renamed folder to custom
renamed folder to custom
updates to zshrc
merged from master