New zsh prompt
Smaller gVim font
Remove unnecessary things for servers

Conflicts:
	subl/Packages/User/Preferences.sublime-settings
	zsh/.zsh/00-exports.zsh
	zsh/.zsh/10-aliases.zsh
	zsh/.zsh/15-aliases-global.zsh
	zsh/.zsh/40-bookmarks.zsh
	zsh/.zsh/functions/audio.zsh
	zsh/.zsh/functions/backup.zsh
	zsh/.zsh/functions/cfg.zsh
	zsh/.zsh/functions/misc.zsh
	zsh/.zsh/functions/notify.zsh
	zsh/.zsh/functions/osx.zsh
	zsh/.zsh/functions/scan.zsh
	zsh/.zsh/functions/secrets.zsh
	zsh/.zsh/functions/smServer.zsh
	zsh/.zsh/functions/streaming.zsh
Disable some zsh libs for servers
Fix syntax highlighting symlink
Merge remote-tracking branch 'origin/servers' into servers