oh-my-zsh update and other stuff
Merge branch 'debian' into debian-dreamhost

Conflicts:
	oh-my-zsh/lib/termsupport.zsh
	zshrc
Merge branch 'debian-dreamhost' of github.com:kevincolyar/dotfiles into debian-dreamhost