Merge branch 'upstream'
Changing themes to use only extended ASCII characters.

Also changing color codes in 256 color theme.
Merge branch 'master' of github.com:jmatth/oh-my-zsh

Conflicts:
	custom/jmatth.zsh-theme
	custom/jmatth_256.zsh-theme
	lib/git.zsh
Removing syntax highlighting submodule.
Merging custom themes.
Moving custom theme to main themes dir.