diff --git a/zsh/.zcompdump b/zsh/.zcompdump
new file mode 100644
index 0000000..7a23086
--- /dev/null
+++ b/zsh/.zcompdump
@@ -0,0 +1,1367 @@
+#files: 591	version: 4.3.9
+
+_comps=(
+'-' '_precommand'
+'-array-value-' '_value'
+'-assign-parameter-' '_assign'
+'-brace-parameter-' '_brace_parameter'
+'-command-' '_autocd'
+'-command-line-' '_normal'
+'-condition-' '_condition'
+'-default-' '_default'
+'-equal-' '_equal'
+'-first-' '_first'
+'-math-' '_math'
+'-parameter-' '_parameter'
+'-redirect-' '_redirect'
+'-redirect-,-default-,-default-' '_files'
+'-redirect-,<,bunzip2' '_bzip2'
+'-redirect-,<,bzip2' '_bzip2'
+'-redirect-,<,compress' '_compress'
+'-redirect-,<,gunzip' '_gzip'
+'-redirect-,<,gzip' '_gzip'
+'-redirect-,<,uncompress' '_compress'
+'-redirect-,>,bzip2' '_bzip2'
+'-redirect-,>,compress' '_compress'
+'-redirect-,>,gzip' '_gzip'
+'-subscript-' '_subscript'
+'-tilde-' '_tilde'
+'-value-' '_value'
+'-value-,-default-,-default-' '_value'
+'-value-,ANT_ARGS,-default-' '_ant'
+'-value-,CFLAGS,-default-' '_gcc'
+'-value-,CPPFLAGS,-default-' '_gcc'
+'-value-,DISPLAY,-default-' '_x_display'
+'-value-,GREP_OPTIONS,-default-' '_grep'
+'-value-,GZIP,-default-' '_gzip'
+'-value-,LANG,-default-' '_locales'
+'-value-,LANGUAGE,-default-' '_locales'
+'-value-,LDFLAGS,-default-' '_gcc'
+'-value-,LESS,-default-' '_less'
+'-value-,LESSCHARSET,-default-' '_less'
+'-value-,LPDEST,-default-' '_printers'
+'-value-,P4CLIENT,-default-' '_perforce'
+'-value-,P4MERGE,-default-' '_perforce'
+'-value-,P4PORT,-default-' '_perforce'
+'-value-,P4USER,-default-' '_perforce'
+'-value-,PERLDOC,-default-' '_perldoc'
+'-value-,PRINTER,-default-' '_printers'
+'-value-,TERM,-default-' '_terminals'
+'-value-,TERMINFO_DIRS,-default-' '_dir_list'
+'-value-,TZ,-default-' '_time_zone'
+'-value-,VALGRIND_OPTS,-default-' '_valgrind'
+'-value-,WWW_HOME,-default-' '_urls'
+'-value-,XML_CATALOG_FILES,-default-' '_xmlsoft'
+'-vared-' '_in_vared'
+'-zcalc-line-' '_zcalc_line'
+'.' '_source'
+'Mail' '_mail'
+'Mosaic' '_webbrowser'
+'a2dismod' '_a2utils'
+'a2dissite' '_a2utils'
+'a2enmod' '_a2utils'
+'a2ensite' '_a2utils'
+'a2ps' '_a2ps'
+'aaaa' '_hosts'
+'aap' '_aap'
+'acpi' '_acpi'
+'acpitool' '_acpitool'
+'acroread' '_acroread'
+'admin' '_sccs'
+'ali' '_mh'
+'alias' '_alias'
+'amaya' '_webbrowser'
+'analyseplugin' '_analyseplugin'
+'animate' '_imagemagick'
+'anno' '_mh'
+'ant' '_ant'
+'antiword' '_antiword'
+'aoss' '_precommand'
+'apache2ctl' '_apachectl'
+'apachectl' '_apachectl'
+'apm' '_apm'
+'appletviewer' '_java'
+'apropos' '_man'
+'apt-cache' '_apt'
+'apt-cdrom' '_apt'
+'apt-config' '_apt'
+'apt-file' '_apt-file'
+'apt-get' '_apt'
+'apt-move' '_apt-move'
+'apt-show-versions' '_apt-show-versions'
+'aptitude' '_aptitude'
+'arena' '_webbrowser'
+'arp' '_arp'
+'arping' '_arping'
+'attr' '_attr'
+'auto-apt' '_auto-apt'
+'autoload' '_typeset'
+'awk' '_awk'
+'bash' '_sh'
+'baz' '_baz'
+'bg' '_jobs_bg'
+'bindkey' '_bindkey'
+'bison' '_bison'
+'bogofilter' '_bogofilter'
+'bogotune' '_bogofilter'
+'bogoutil' '_bogofilter'
+'brctl' '_brctl'
+'btdownloadcurses' '_bittorrent'
+'btdownloadgui' '_bittorrent'
+'btdownloadheadless' '_bittorrent'
+'btlaunchmany' '_bittorrent'
+'btlaunchmanycurses' '_bittorrent'
+'btmakemetafile' '_bittorrent'
+'btreannounce' '_bittorrent'
+'btrename' '_bittorrent'
+'bts' '_bts'
+'btshowmetainfo' '_bittorrent'
+'bttrack' '_bittorrent'
+'bug' '_bug'
+'buildhash' '_ispell'
+'builtin' '_builtin'
+'bunzip2' '_bzip2'
+'burst' '_mh'
+'bzcat' '_bzip2'
+'bzip2' '_bzip2'
+'bzip2recover' '_bzip2'
+'bzr' '_bzr'
+'cal' '_cal'
+'calendar' '_calendar'
+'catchsegv' '_precommand'
+'ccal' '_ccal'
+'cd' '_cd'
+'cdbs-edit-patch' '_cdbs-edit-patch'
+'cdc' '_sccs'
+'cdcd' '_cdcd'
+'cdrdao' '_cdrdao'
+'cdrecord' '_cdrecord'
+'certtool' '_gnutls'
+'cftp' '_twisted'
+'chage' '_users'
+'chdir' '_cd'
+'chflags' '_chflags'
+'chfn' '_users'
+'chgrp' '_chown'
+'chimera' '_webbrowser'
+'chkconfig' '_chkconfig'
+'chmod' '_chmod'
+'chown' '_chown'
+'chrt' '_chrt'
+'chsh' '_users'
+'ci' '_rcs'
+'ckeygen' '_twisted'
+'clear' '_nothing'
+'co' '_rcs'
+'comb' '_sccs'
+'combine' '_imagemagick'
+'comm' '_comm'
+'command' '_command'
+'comp' '_mh'
+'compdef' '_compdef'
+'composite' '_imagemagick'
+'compress' '_compress'
+'conch' '_twisted'
+'config.status' '_configure'
+'configure' '_configure'
+'convert' '_imagemagick'
+'cowsay' '_cowsay'
+'cowthink' '_cowsay'
+'cp' '_cp'
+'cpio' '_cpio'
+'cplay' '_cplay'
+'crsh' '_cssh'
+'csh' '_sh'
+'cssh' '_cssh'
+'csup' '_csup'
+'curl' '_urls'
+'cut' '_cut'
+'cvs' '_cvs'
+'cvsup' '_cvsup'
+'cygcheck' '_cygcheck'
+'cygcheck.exe' '_cygcheck'
+'cygpath' '_cygpath'
+'cygpath.exe' '_cygpath'
+'cygrunsrv' '_cygrunsrv'
+'cygrunsrv.exe' '_cygrunsrv'
+'cygserver' '_cygserver'
+'cygserver.exe' '_cygserver'
+'cygstart' '_cygstart'
+'cygstart.exe' '_cygstart'
+'dak' '_dak'
+'darcs' '_darcs'
+'date' '_date'
+'dch' '_debchange'
+'dchroot' '_dchroot'
+'dchroot-dsa' '_dchroot-dsa'
+'dcop' '_dcop'
+'dcopclient' '_dcop'
+'dcopfind' '_dcop'
+'dcopobject' '_dcop'
+'dcopref' '_dcop'
+'dcopstart' '_dcop'
+'dd' '_dd'
+'debchange' '_debchange'
+'debdiff' '_debdiff'
+'debfoster' '_debfoster'
+'debsign' '_debsign'
+'declare' '_typeset'
+'defaults' '_defaults'
+'delta' '_sccs'
+'df' '_directories'
+'dhclient' '_dhclient'
+'dhclient3' '_dhclient'
+'dict' '_dict'
+'diff' '_diff'
+'diffstat' '_diffstat'
+'dillo' '_webbrowser'
+'dircmp' '_directories'
+'dirs' '_dirs'
+'disable' '_disable'
+'disown' '_jobs_fg'
+'display' '_imagemagick'
+'dist' '_mh'
+'django-admin' '_django'
+'django-admin.py' '_django'
+'dlocate' '_dlocate'
+'dmake' '_make'
+'dmidecode' '_dmidecode'
+'domainname' '_yp'
+'dosdel' '_floppy'
+'dosread' '_floppy'
+'dpatch-edit-patch' '_dpatch-edit-patch'
+'dpkg' '_dpkg'
+'dpkg-buildpackage' '_dpkg-buildpackage'
+'dpkg-cross' '_dpkg-cross'
+'dpkg-deb' '_dpkg'
+'dpkg-query' '_dpkg'
+'dpkg-reconfigure' '_dpkg'
+'dpkg-repack' '_dpkg-repack'
+'dpkg-source' '_dpkg_source'
+'dput' '_dput'
+'du' '_du'
+'dumper' '_dumper'
+'dumper.exe' '_dumper'
+'dupload' '_dupload'
+'dvibook' '_dvi'
+'dviconcat' '_dvi'
+'dvicopy' '_dvi'
+'dvidvi' '_dvi'
+'dvips' '_dvi'
+'dviselect' '_dvi'
+'dvitodvi' '_dvi'
+'dvitype' '_dvi'
+'ecasound' '_ecasound'
+'echotc' '_echotc'
+'echoti' '_echoti'
+'egrep' '_grep'
+'elinks' '_elinks'
+'elm' '_elm'
+'emulate' '_emulate'
+'enable' '_enable'
+'enscript' '_enscript'
+'env' '_env'
+'epsffit' '_psutils'
+'ethtool' '_ethtool'
+'eval' '_precommand'
+'eview' '_vim'
+'evim' '_vim'
+'exec' '_precommand'
+'exim' '_vim'
+'explodepkg' '_pkgtool'
+'export' '_typeset'
+'express' '_webbrowser'
+'extcheck' '_java'
+'extractres' '_psutils'
+'fakeroot' '_fakeroot'
+'false' '_nothing'
+'fc' '_fc'
+'fetch' '_fetch'
+'fetchmail' '_fetchmail'
+'fg' '_jobs_fg'
+'fgrep' '_grep'
+'figlet' '_figlet'
+'find' '_find'
+'findaffix' '_ispell'
+'finger' '_finger'
+'fink' '_fink'
+'firefox' '_mozilla'
+'fixdlsrps' '_psutils'
+'fixfmps' '_psutils'
+'fixmacps' '_psutils'
+'fixpsditps' '_psutils'
+'fixpspps' '_psutils'
+'fixscribeps' '_psutils'
+'fixtpps' '_psutils'
+'fixwfwps' '_psutils'
+'fixwpps' '_psutils'
+'fixwwps' '_psutils'
+'flasher' '_flasher'
+'flex' '_flex'
+'flist' '_mh'
+'flists' '_mh'
+'float' '_typeset'
+'fned' '_zed'
+'folder' '_mh'
+'folders' '_mh'
+'fortune' '_fortune'
+'forw' '_mh'
+'freebsd-update' '_freebsd-update'
+'fsh' '_fsh'
+'ftp' '_hosts'
+'functions' '_typeset'
+'fuser' '_fuser'
+'fusermount' '_fusermount'
+'fwhois' '_whois'
+'g++' '_gcc'
+'galeon' '_webbrowser'
+'gcc' '_gcc'
+'gdb' '_gdb'
+'gdiff' '_diff'
+'genisoimage' '_genisoimage'
+'get' '_sccs'
+'getafm' '_psutils'
+'getclip' '_getclip'
+'getclip.exe' '_getclip'
+'getconf' '_getconf'
+'getent' '_getent'
+'getfacl' '_getfacl'
+'getfacl.exe' '_getfacl'
+'getfattr' '_attr'
+'getmail' '_getmail'
+'getopts' '_vars'
+'gex' '_vim'
+'ggv' '_gnome-gv'
+'ghostscript' '_gs'
+'ghostview' '_pspdf'
+'git' '_git'
+'git-add' '_git'
+'git-am' '_git'
+'git-annotate' '_git'
+'git-apply' '_git'
+'git-applymbox' '_git'
+'git-applypatch' '_git'
+'git-archimport' '_git'
+'git-archive' '_git'
+'git-bisect' '_git'
+'git-blame' '_git'
+'git-branch' '_git'
+'git-cat-file' '_git'
+'git-check-attr' '_git'
+'git-check-ref-format' '_git'
+'git-checkout' '_git'
+'git-checkout-index' '_git'
+'git-cherry' '_git'
+'git-cherry-pick' '_git'
+'git-clean' '_git'
+'git-clone' '_git'
+'git-clone-pack' '_git'
+'git-commit' '_git'
+'git-commit-tree' '_git'
+'git-config' '_git'
+'git-convert-objects' '_git'
+'git-count-objects' '_git'
+'git-cvsexportcommit' '_git'
+'git-cvsimport' '_git'
+'git-cvsserver' '_git'
+'git-daemon' '_git'
+'git-describe' '_git'
+'git-diff' '_git'
+'git-diff-files' '_git'
+'git-diff-index' '_git'
+'git-diff-stages' '_git'
+'git-diff-tree' '_git'
+'git-fast-import' '_git'
+'git-fetch' '_git'
+'git-fetch-pack' '_git'
+'git-fmt-merge-msg' '_git'
+'git-for-each-ref' '_git'
+'git-format-patch' '_git'
+'git-fsck' '_git'
+'git-gc' '_git'
+'git-get-tar-commit-id' '_git'
+'git-grep' '_git'
+'git-hash-object' '_git'
+'git-http-fetch' '_git'
+'git-http-push' '_git'
+'git-imap-send' '_git'
+'git-index-pack' '_git'
+'git-init' '_git'
+'git-instaweb' '_git'
+'git-local-fetch' '_git'
+'git-log' '_git'
+'git-lost-found' '_git'
+'git-ls-files' '_git'
+'git-ls-remote' '_git'
+'git-ls-tree' '_git'
+'git-mailinfo' '_git'
+'git-mailsplit' '_git'
+'git-merge' '_git'
+'git-merge-base' '_git'
+'git-merge-file' '_git'
+'git-merge-index' '_git'
+'git-merge-one-file' '_git'
+'git-merge-tree' '_git'
+'git-mergetool' '_git'
+'git-mktag' '_git'
+'git-mktree' '_git'
+'git-mv' '_git'
+'git-name-rev' '_git'
+'git-pack-objects' '_git'
+'git-pack-redundant' '_git'
+'git-pack-refs' '_git'
+'git-patch-id' '_git'
+'git-peek-remote' '_git'
+'git-prune' '_git'
+'git-prune-packed' '_git'
+'git-pull' '_git'
+'git-push' '_git'
+'git-quiltimport' '_git'
+'git-read-tree' '_git'
+'git-rebase' '_git'
+'git-receive-pack' '_git'
+'git-reflog' '_git'
+'git-relink' '_git'
+'git-remote' '_git'
+'git-repack' '_git'
+'git-request-pull' '_git'
+'git-rerere' '_git'
+'git-reset' '_git'
+'git-rev-list' '_git'
+'git-rev-parse' '_git'
+'git-revert' '_git'
+'git-rm' '_git'
+'git-send-email' '_git'
+'git-send-pack' '_git'
+'git-sh-setup' '_git'
+'git-shell' '_git'
+'git-shortlog' '_git'
+'git-show' '_git'
+'git-show-branch' '_git'
+'git-show-index' '_git'
+'git-show-ref' '_git'
+'git-ssh-fetch' '_git'
+'git-ssh-upload' '_git'
+'git-status' '_git'
+'git-stripspace' '_git'
+'git-svn' '_git'
+'git-svnimport' '_git'
+'git-symbolic-ref' '_git'
+'git-tag' '_git'
+'git-tar-tree' '_git'
+'git-unpack-file' '_git'
+'git-unpack-objects' '_git'
+'git-update-index' '_git'
+'git-update-ref' '_git'
+'git-update-server-info' '_git'
+'git-upload-archive' '_git'
+'git-upload-pack' '_git'
+'git-var' '_git'
+'git-verify-pack' '_git'
+'git-verify-tag' '_git'
+'git-whatchanged' '_git'
+'git-write-tree' '_git'
+'global' '_global'
+'gls' '_ls'
+'gmake' '_make'
+'gmplayer' '_mplayer'
+'gnome-gv' '_gnome-gv'
+'gnupod_INIT' '_gnupod'
+'gnupod_INIT.pl' '_gnupod'
+'gnupod_addsong' '_gnupod'
+'gnupod_addsong.pl' '_gnupod'
+'gnupod_check' '_gnupod'
+'gnupod_check.pl' '_gnupod'
+'gnupod_search' '_gnupod'
+'gnupod_search.pl' '_gnupod'
+'gnutls-cli' '_gnutls'
+'gnutls-cli-debug' '_gnutls'
+'gpg' '_gpg'
+'gpgv' '_gpg'
+'gphoto2' '_gphoto2'
+'gprof' '_gprof'
+'gqview' '_gqview'
+'grail' '_webbrowser'
+'grep' '_grep'
+'grep-excuses' '_grep-excuses'
+'groff' '_groff'
+'groupadd' '_user_admin'
+'groupdel' '_groups'
+'groupmod' '_user_admin'
+'groups' '_users'
+'growisofs' '_growisofs'
+'gs' '_gs'
+'gsbj' '_pspdf'
+'gsdj' '_pspdf'
+'gsdj500' '_pspdf'
+'gslj' '_pspdf'
+'gslp' '_pspdf'
+'gsnd' '_pspdf'
+'gtar' '_tar'
+'guilt' '_guilt'
+'guilt-add' '_guilt'
+'guilt-applied' '_guilt'
+'guilt-delete' '_guilt'
+'guilt-files' '_guilt'
+'guilt-fold' '_guilt'
+'guilt-fork' '_guilt'
+'guilt-header' '_guilt'
+'guilt-help' '_guilt'
+'guilt-import' '_guilt'
+'guilt-import-commit' '_guilt'
+'guilt-init' '_guilt'
+'guilt-new' '_guilt'
+'guilt-next' '_guilt'
+'guilt-patchbomb' '_guilt'
+'guilt-pop' '_guilt'
+'guilt-prev' '_guilt'
+'guilt-push' '_guilt'
+'guilt-rebase' '_guilt'
+'guilt-refresh' '_guilt'
+'guilt-rm' '_guilt'
+'guilt-series' '_guilt'
+'guilt-status' '_guilt'
+'guilt-top' '_guilt'
+'guilt-unapplied' '_guilt'
+'gunzip' '_gzip'
+'gut-runstatus' '_git'
+'gv' '_gv'
+'gview' '_vim'
+'gvim' '_vim'
+'gvimdiff' '_vim'
+'gzcat' '_gzip'
+'gzilla' '_webbrowser'
+'gzip' '_gzip'
+'hash' '_hash'
+'hdiutil' '_hdiutil'
+'help' '_sccs'
+'hg' '_mercurial'
+'history' '_fc'
+'host' '_hosts'
+'hotjava' '_webbrowser'
+'iceweasel' '_mozilla'
+'icombine' '_ispell'
+'iconv' '_iconv'
+'id' '_id'
+'identify' '_imagemagick'
+'ifconfig' '_ifconfig'
+'ifdown' '_net_interfaces'
+'iftop' '_iftop'
+'ifup' '_net_interfaces'
+'ijoin' '_ispell'
+'import' '_imagemagick'
+'inc' '_mh'
+'includeres' '_psutils'
+'info' '_texinfo'
+'infocmp' '_terminals'
+'insmod' '_modutils'
+'install-info' '_texinfo'
+'installpkg' '_pkgtool'
+'integer' '_typeset'
+'invoke-rc.d' '_invoke-rc.d'
+'ionice' '_ionice'
+'ip' '_ip'
+'ipset' '_ipset'
+'iptables' '_iptables'
+'iptables-restore' '_iptables'
+'iptables-save' '_iptables'
+'irssi' '_irssi'
+'ispell' '_ispell'
+'iwconfig' '_iwconfig'
+'jadetex' '_tex'
+'jar' '_java'
+'jarsigner' '_java'
+'java' '_java'
+'javac' '_java'
+'javadoc' '_java'
+'javah' '_java'
+'javap' '_java'
+'jdb' '_java'
+'jobs' '_jobs_builtin'
+'joe' '_joe'
+'join' '_join'
+'keytool' '_java'
+'kfmclient' '_kfmclient'
+'kill' '_kill'
+'killall' '_killall'
+'killall5' '_killall'
+'kldload' '_kld'
+'kldunload' '_kld'
+'knock' '_knock'
+'konqueror' '_webbrowser'
+'kpdf' '_pdf'
+'ksh' '_sh'
+'kvno' '_kvno'
+'last' '_last'
+'lastb' '_last'
+'latex' '_tex'
+'ldd' '_ldd'
+'less' '_less'
+'let' '_math'
+'lftp' '_ncftp'
+'light' '_webbrowser'
+'lighty-disable-mod' '_lighttpd'
+'lighty-enable-mod' '_lighttpd'
+'limit' '_limit'
+'linda' '_linda'
+'links' '_links'
+'lintian' '_lintian'
+'lintian-info' '_lintian'
+'linux' '_uml'
+'loadkeys' '_loadkeys'
+'local' '_typeset'
+'locate' '_locate'
+'log' '_nothing'
+'logname' '_nothing'
+'look' '_look'
+'lore' '_twisted'
+'losetup' '_losetup'
+'lp' '_lp'
+'lpq' '_lp'
+'lpr' '_lp'
+'lprm' '_lp'
+'ls' '_ls'
+'lscfg' '_lscfg'
+'lsdev' '_lsdev'
+'lslv' '_lslv'
+'lsmod' '_modutils'
+'lsof' '_lsof'
+'lspv' '_lspv'
+'lsusb' '_lsusb'
+'lsvg' '_lsvg'
+'lynx' '_lynx'
+'lzop' '_lzop'
+'m-a' '_module-assistant'
+'madison' '_madison'
+'mail' '_mail'
+'mailx' '_mail'
+'make' '_make'
+'make-kpkg' '_make-kpkg'
+'makeinfo' '_texinfo'
+'makepkg' '_pkgtool'
+'man' '_man'
+'manage.py' '_django'
+'manhole' '_twisted'
+'mark' '_mh'
+'mattrib' '_mtools'
+'mcd' '_mtools'
+'mcopy' '_mtools'
+'md5sum' '_md5sum'
+'mdel' '_mtools'
+'mdeltree' '_mtools'
+'mdir' '_mtools'
+'mdu' '_mtools'
+'members' '_members'
+'mencal' '_mencal'
+'mere' '_mere'
+'merge' '_rcs'
+'mergechanges' '_mergechanges'
+'metaflac' '_metaflac'
+'mformat' '_mtools'
+'mgv' '_pspdf'
+'mhlist' '_mh'
+'mhmail' '_mh'
+'mhn' '_mh'
+'mhparam' '_mh'
+'mhpath' '_mh'
+'mhshow' '_mh'
+'mhstore' '_mh'
+'mii-tool' '_mii-tool'
+'mkdir' '_mkdir'
+'mkisofs' '_growisofs'
+'mkshortcut' '_mkshortcut'
+'mkshortcut.exe' '_mkshortcut'
+'mktap' '_twisted'
+'mktunes' '_gnupod'
+'mktunes.pl' '_gnupod'
+'mkzsh' '_mkzsh'
+'mkzsh.exe' '_mkzsh'
+'mlabel' '_mtools'
+'mlocate' '_locate'
+'mmd' '_mtools'
+'mmm' '_webbrowser'
+'mmount' '_mtools'
+'mmove' '_mtools'
+'modinfo' '_modutils'
+'modprobe' '_modutils'
+'module' '_module'
+'module-assistant' '_module-assistant'
+'mogrify' '_imagemagick'
+'mondoarchive' '_mondo'
+'montage' '_imagemagick'
+'mount' '_mount'
+'mozilla' '_mozilla'
+'mozilla-firefox' '_mozilla'
+'mozilla-xremote-client' '_mozilla'
+'mpc' '_mpc'
+'mplayer' '_mplayer'
+'mrd' '_mtools'
+'mread' '_mtools'
+'mren' '_mtools'
+'msgchk' '_mh'
+'mt' '_mt'
+'mtn' '_monotone'
+'mtoolstest' '_mtools'
+'mtr' '_mtr'
+'mtype' '_mtools'
+'munchlist' '_ispell'
+'mush' '_mail'
+'mutt' '_mutt'
+'mx' '_hosts'
+'mysql' '_mysql_utils'
+'mysqladmin' '_mysql_utils'
+'mysqldiff' '_mysqldiff'
+'mysqldump' '_mysql_utils'
+'mysqlimport' '_mysql_utils'
+'mysqlshow' '_mysql_utils'
+'nail' '_mail'
+'native2ascii' '_java'
+'nautilus' '_nautilus'
+'nc' '_netcat'
+'ncal' '_cal'
+'ncftp' '_ncftp'
+'ncl' '_nedit'
+'nedit' '_nedit'
+'nedit-nc' '_nedit'
+'netcat' '_netcat'
+'netrik' '_webbrowser'
+'netscape' '_netscape'
+'newgrp' '_groups'
+'next' '_mh'
+'nice' '_nice'
+'nmap' '_nmap'
+'nmblookup' '_samba'
+'nocorrect' '_precommand'
+'noglob' '_precommand'
+'nohup' '_precommand'
+'ns' '_hosts'
+'nslookup' '_nslookup'
+'ntalk' '_other_accounts'
+'odme' '_object_classes'
+'odmget' '_object_classes'
+'odmshow' '_object_classes'
+'ogg123' '_vorbis'
+'oggdec' '_vorbis'
+'oggenc' '_vorbis'
+'ogginfo' '_vorbis'
+'open' '_open'
+'opera' '_webbrowser'
+'p4' '_perforce'
+'p4d' '_perforce'
+'pack' '_pack'
+'packf' '_mh'
+'parsehdlist' '_urpmi'
+'passwd' '_users'
+'patch' '_patch'
+'pax' '_pax'
+'pcat' '_pack'
+'pcred' '_pids'
+'pdf2dsc' '_pdf'
+'pdf2ps' '_pdf'
+'pdffonts' '_pdf'
+'pdfimages' '_pdf'
+'pdfinfo' '_pdf'
+'pdfjadetex' '_tex'
+'pdflatex' '_tex'
+'pdfopt' '_pdf'
+'pdftopbm' '_pdf'
+'pdftops' '_pdf'
+'pdftotext' '_pdf'
+'perl' '_perl'
+'perldoc' '_perldoc'
+'pfiles' '_pids'
+'pflags' '_pids'
+'phoenix' '_webbrowser'
+'php' '_php'
+'pick' '_mh'
+'pine' '_pine'
+'pinef' '_pine'
+'ping' '_ping'
+'piuparts' '_piuparts'
+'pkg-config' '_pkg-config'
+'pkg_add' '_bsd_pkg'
+'pkg_create' '_bsd_pkg'
+'pkg_delete' '_bsd_pkg'
+'pkg_info' '_bsd_pkg'
+'pkgadd' '_pkgadd'
+'pkginfo' '_pkginfo'
+'pkgrm' '_pkgrm'
+'pkgtool' '_pkgtool'
+'pldd' '_pids'
+'pmake' '_make'
+'pman' '_perl_modules'
+'pmap' '_pids'
+'pmcat' '_perl_modules'
+'pmdesc' '_perl_modules'
+'pmeth' '_perl_modules'
+'pmexp' '_perl_modules'
+'pmfunc' '_perl_modules'
+'pmload' '_perl_modules'
+'pmls' '_perl_modules'
+'pmpath' '_perl_modules'
+'pmvers' '_perl_modules'
+'podgrep' '_perl_modules'
+'podpath' '_perl_modules'
+'podtoc' '_perl_modules'
+'poff' '_pon'
+'policytool' '_java'
+'pon' '_pon'
+'popd' '_directory_stack'
+'portaudit' '_portaudit'
+'portlint' '_portlint'
+'portsnap' '_portsnap'
+'postsuper' '_postfix'
+'powerd' '_powerd'
+'prcs' '_prcs'
+'prev' '_mh'
+'print' '_print'
+'printenv' '_printenv'
+'prompt' '_prompt'
+'prs' '_sccs'
+'prt' '_sccs'
+'prun' '_pids'
+'ps2ascii' '_pspdf'
+'ps2epsi' '_ps'
+'ps2pdf' '_ps'
+'ps2pdf12' '_ps'
+'ps2pdf13' '_ps'
+'ps2pdf14' '_ps'
+'ps2pdfwr' '_ps'
+'ps2ps' '_ps'
+'psbook' '_psutils'
+'pscp' '_pscp'
+'pscp.exe' '_pscp'
+'psig' '_pids'
+'psmerge' '_psutils'
+'psmulti' '_ps'
+'psnup' '_psutils'
+'psresize' '_psutils'
+'psselect' '_psutils'
+'pstack' '_pids'
+'pstoedit' '_pspdf'
+'pstop' '_pids'
+'pstops' '_psutils'
+'pstotgif' '_pspdf'
+'pswrap' '_ps'
+'ptree' '_pids'
+'pump' '_pump'
+'pushd' '_cd'
+'putclip' '_putclip'
+'putclip.exe' '_putclip'
+'pwait' '_pids'
+'pwdx' '_pids'
+'pyhtmlizer' '_twisted'
+'python' '_python'
+'qemu' '_qemu'
+'qiv' '_qiv'
+'qtplay' '_qtplay'
+'querybts' '_bug'
+'quilt' '_quilt'
+'r' '_fc'
+'raggle' '_raggle'
+'rake' '_rake'
+'ranlib' '_ranlib'
+'rar' '_rar'
+'rc' '_sh'
+'rcp' '_rlogin'
+'rcs' '_rcs'
+'rcsdiff' '_rcs'
+'read' '_read'
+'readonly' '_typeset'
+'refile' '_mh'
+'rehash' '_hash'
+'removepkg' '_pkgtool'
+'remsh' '_rlogin'
+'renice' '_renice'
+'repl' '_mh'
+'reportbug' '_bug'
+'reprepro' '_reprepro'
+'retawq' '_webbrowser'
+'rgview' '_vim'
+'rgvim' '_vim'
+'ri' '_ri'
+'rlogin' '_rlogin'
+'rm' '_rm'
+'rmadison' '_madison'
+'rmdel' '_sccs'
+'rmdir' '_directories'
+'rmf' '_mh'
+'rmic' '_java'
+'rmid' '_java'
+'rmiregistry' '_java'
+'rmm' '_mh'
+'rmmod' '_modutils'
+'rpm' '_rpm'
+'rrdtool' '_rrdtool'
+'rsh' '_rlogin'
+'rsync' '_rsync'
+'rtin' '_tin'
+'rubber' '_rubber'
+'rubber-info' '_rubber'
+'rubber-pipe' '_rubber'
+'ruby' '_ruby'
+'rup' '_hosts'
+'rusage' '_precommand'
+'rview' '_vim'
+'rvim' '_vim'
+'rwho' '_hosts'
+'sabcmd' '_sablotron'
+'sact' '_sccs'
+'scan' '_mh'
+'sccs' '_sccs'
+'sccsdiff' '_sccs'
+'sched' '_sched'
+'schroot' '_schroot'
+'scp' '_ssh'
+'screen' '_screen'
+'sed' '_sed'
+'serialver' '_java'
+'service' '_service'
+'set' '_set'
+'setfattr' '_attr'
+'setopt' '_setopt'
+'sftp' '_ssh'
+'sh' '_sh'
+'shift' '_arrays'
+'show' '_mh'
+'showchar' '_psutils'
+'showmount' '_showmount'
+'sisu' '_sisu'
+'skipstone' '_webbrowser'
+'slitex' '_tex'
+'slocate' '_locate'
+'slogin' '_ssh'
+'slrn' '_slrn'
+'smbclient' '_samba'
+'smbcontrol' '_samba'
+'smbstatus' '_samba'
+'smit' '_smit'
+'smitty' '_smit'
+'soa' '_hosts'
+'socket' '_socket'
+'softwareupdate' '_softwareupdate'
+'sort' '_sort'
+'sortm' '_mh'
+'source' '_source'
+'spamassassin' '_spamassassin'
+'sqsh' '_sqsh'
+'sr' '_surfraw'
+'srptool' '_gnutls'
+'ssh' '_ssh'
+'ssh-add' '_ssh'
+'ssh-agent' '_ssh'
+'ssh-keygen' '_ssh'
+'sshfs' '_sshfs'
+'star' '_tar'
+'stat' '_stat'
+'stg' '_stgit'
+'strace' '_strace'
+'strip' '_strip'
+'stty' '_stty'
+'su' '_su'
+'sudo' '_sudo'
+'surfraw' '_surfraw'
+'svn' '_subversion'
+'svn-buildpackage' '_svn-buildpackage'
+'svnadmin' '_subversion'
+'svnadmin-static' '_subversion'
+'sync' '_nothing'
+'sysctl' '_sysctl'
+'talk' '_other_accounts'
+'tap2deb' '_twisted'
+'tap2rpm' '_twisted'
+'tapconvert' '_twisted'
+'tar' '_tar'
+'tardy' '_tardy'
+'tcp_open' '_tcpsys'
+'tcpdump' '_tcpdump'
+'tcptraceroute' '_tcptraceroute'
+'tcsh' '_sh'
+'telnet' '_telnet'
+'tex' '_tex'
+'texi2dvi' '_texinfo'
+'texindex' '_texinfo'
+'tidy' '_tidy'
+'time' '_precommand'
+'times' '_nothing'
+'tin' '_tin'
+'tkconch' '_twisted'
+'tkinfo' '_texinfo'
+'tkmktap' '_twisted'
+'tla' '_tla'
+'todo.sh' '_todo.sh'
+'toilet' '_toilet'
+'totdconfig' '_totd'
+'tpb' '_tpb'
+'tpconfig' '_tpconfig'
+'tpkg-debarch' '_toolchain-source'
+'tpkg-install' '_toolchain-source'
+'tpkg-install-libc' '_toolchain-source'
+'tpkg-make' '_toolchain-source'
+'tpkg-update' '_toolchain-source'
+'tracepath' '_tracepath'
+'tracepath6' '_tracepath'
+'traceroute' '_hosts'
+'trap' '_trap'
+'trial' '_twisted'
+'true' '_nothing'
+'tryaffix' '_ispell'
+'ttyctl' '_ttyctl'
+'tunctl' '_uml'
+'tune2fs' '_tune2fs'
+'tunes2pod' '_gnupod'
+'tunes2pod.pl' '_gnupod'
+'twistd' '_twisted'
+'txt' '_hosts'
+'type' '_which'
+'typeset' '_typeset'
+'ulimit' '_ulimit'
+'uml_mconsole' '_uml'
+'uml_moo' '_uml'
+'uml_switch' '_uml'
+'umount' '_mount'
+'unace' '_unace'
+'unalias' '_aliases'
+'uname' '_uname'
+'uncompress' '_compress'
+'unexpand' '_unexpand'
+'unfunction' '_functions'
+'unget' '_sccs'
+'unhash' '_unhash'
+'uniq' '_uniq'
+'units' '_units'
+'unlimit' '_limits'
+'unpack' '_pack'
+'unrar' '_rar'
+'unset' '_vars'
+'unsetopt' '_unsetopt'
+'unzip' '_zip'
+'update-alternatives' '_update-alternatives'
+'update-rc.d' '_update-rc.d'
+'upgradepkg' '_pkgtool'
+'urpme' '_urpmi'
+'urpmf' '_urpmi'
+'urpmi' '_urpmi'
+'urpmi.addmedia' '_urpmi'
+'urpmi.removemedia' '_urpmi'
+'urpmi.update' '_urpmi'
+'urpmq' '_urpmi'
+'urxvt' '_urxvt'
+'uscan' '_uscan'
+'useradd' '_user_admin'
+'userdel' '_users'
+'usermod' '_user_admin'
+'val' '_sccs'
+'valgrind' '_valgrind'
+'vared' '_vared'
+'vim' '_vim'
+'vim-addons' '_vim-addons'
+'vimdiff' '_vim'
+'vncserver' '_vnc'
+'vncviewer' '_vnc'
+'vorbiscomment' '_vorbiscomment'
+'vserver' '_vserver'
+'vux' '_vux'
+'vuxctl' '_vux'
+'w3m' '_w3m'
+'wait' '_wait'
+'wajig' '_wajig'
+'wanna-build' '_wanna-build'
+'websetroot' '_twisted'
+'wget' '_wget'
+'what' '_sccs'
+'whatis' '_man'
+'whence' '_which'
+'where' '_which'
+'whereis' '_whereis'
+'which' '_which'
+'whoami' '_nothing'
+'whois' '_whois'
+'whom' '_mh'
+'wiggle' '_wiggle'
+'wodim' '_cdrecord'
+'write' '_users_on'
+'www' '_webbrowser'
+'xargs' '_xargs'
+'xauth' '_xauth'
+'xdpyinfo' '_x_utils'
+'xdvi' '_xdvi'
+'xelatex' '_tex'
+'xetex' '_tex'
+'xev' '_x_utils'
+'xfd' '_x_utils'
+'xfig' '_xfig'
+'xfontsel' '_x_utils'
+'xhost' '_x_utils'
+'xkill' '_x_utils'
+'xli' '_xloadimage'
+'xloadimage' '_xloadimage'
+'xmllint' '_xmlsoft'
+'xmodmap' '_xmodmap'
+'xmosaic' '_webbrowser'
+'xon' '_x_utils'
+'xpdf' '_xpdf'
+'xping' '_hosts'
+'xrandr' '_xrandr'
+'xrdb' '_x_utils'
+'xscreensaver-command' '_xscreensaver'
+'xset' '_xset'
+'xsetbg' '_xloadimage'
+'xsetroot' '_x_utils'
+'xsltproc' '_xmlsoft'
+'xterm' '_xterm'
+'xtightvncviewer' '_vnc'
+'xtp' '_imagemagick'
+'xv' '_xv'
+'xview' '_xloadimage'
+'xvnc4viewer' '_vnc'
+'xvncviewer' '_vnc'
+'xwd' '_x_utils'
+'xwininfo' '_x_utils'
+'xwit' '_xwit'
+'xwud' '_x_utils'
+'yast' '_yast'
+'yast2' '_yast'
+'ypbind' '_yp'
+'ypcat' '_yp'
+'ypmatch' '_yp'
+'yppasswd' '_yp'
+'yppoll' '_yp'
+'yppush' '_yp'
+'ypserv' '_yp'
+'ypset' '_yp'
+'ypwhich' '_yp'
+'ypxfr' '_yp'
+'ytalk' '_other_accounts'
+'yum' '_yum'
+'zcat' '_zcat'
+'zcompile' '_zcompile'
+'zcp' '_zmv'
+'zdump' '_zdump'
+'zed' '_zed'
+'zen' '_webbrowser'
+'zfs' '_zfs'
+'zip' '_zip'
+'zipinfo' '_zip'
+'zle' '_zle'
+'zln' '_zmv'
+'zmail' '_mail'
+'zmodload' '_zmodload'
+'zmv' '_zmv'
+'zone' '_hosts'
+'zpool' '_zpool'
+'zpty' '_zpty'
+'zsh' '_sh'
+'zstat' '_stat'
+'zstyle' '_zstyle'
+'zxpdf' '_xpdf'
+)
+
+_services=(
+'-redirect-,<,bunzip2' 'bunzip2'
+'-redirect-,<,bzip2' 'bzip2'
+'-redirect-,<,compress' 'compress'
+'-redirect-,<,gunzip' 'gunzip'
+'-redirect-,<,gzip' 'gzip'
+'-redirect-,<,uncompress' 'uncompress'
+'-redirect-,>,bzip2' 'bunzip2'
+'-redirect-,>,compress' 'uncompress'
+'-redirect-,>,gzip' 'gunzip'
+'Mail' 'mail'
+'bzcat' 'bunzip2'
+'dch' 'debchange'
+'gnupod_INIT.pl' 'gnupod_INIT'
+'gnupod_addsong.pl' 'gnupod_addsong'
+'gnupod_check.pl' 'gnupod_check'
+'gnupod_search.pl' 'gnupod_search'
+'gzcat' 'gunzip'
+'iceweasel' 'firefox'
+'mailx' 'mail'
+'mktunes.pl' 'mktunes'
+'nail' 'mail'
+'ncl' 'nc'
+'nedit-nc' 'nc'
+'pcat' 'unpack'
+'remsh' 'rsh'
+'slogin' 'ssh'
+'svnadmin-static' 'svnadmin'
+'tunes2pod.pl' 'tunes2pod'
+'xelatex' 'latex'
+'xetex' 'tex'
+)
+
+_patcomps=(
+'*/(init|rc[0-9S]#).d/*' '_init_d'
+'zf*' '_zftp'
+)
+
+_postpatcomps=(
+'(p[bgpn]m*|*top[bgpn]m)' '_pbm'
+'(texi(2*|ndex))' '_texi'
+'(tiff*|*2tiff|pal2rgb)' '_tiff'
+'*/X11(|R[456])/*' '_x_arguments'
+'-value-,(ftp|http(|s))_proxy,-default-' '_urls'
+'-value-,*PATH,-default-' '_dir_list'
+'-value-,*path,-default-' '_directories'
+'-value-,LC_*,-default-' '_locales'
+'-value-,RUBY(LIB|OPT|PATH),-default-' '_ruby'
+'yodl(|2*)' '_yodl'
+)
+
+_compautos=(
+'_call_program' '+X'
+)
+
+zle -C _bash_complete-word .complete-word _bash_completions
+zle -C _bash_list-choices .list-choices _bash_completions
+zle -C _complete_debug .complete-word _complete_debug
+zle -C _complete_help .complete-word _complete_help
+zle -C _complete_tag .complete-word _complete_tag
+zle -C _correct_filename .complete-word _correct_filename
+zle -C _correct_word .complete-word _correct_word
+zle -C _expand_alias .complete-word _expand_alias
+zle -C _expand_word .complete-word _expand_word
+zle -C _history-complete-newer .complete-word _history_complete_word
+zle -C _history-complete-older .complete-word _history_complete_word
+zle -C _list_expansions .list-choices _expand_word
+zle -C _most_recent_file .complete-word _most_recent_file
+zle -C _next_tags .list-choices _next_tags
+zle -C _read_comp .complete-word _read_comp
+bindkey '^X^R' _read_comp
+bindkey '^X?' _complete_debug
+bindkey '^XC' _correct_filename
+bindkey '^Xa' _expand_alias
+bindkey '^Xc' _correct_word
+bindkey '^Xd' _list_expansions
+bindkey '^Xe' _expand_word
+bindkey '^Xh' _complete_help
+bindkey '^Xm' _most_recent_file
+bindkey '^Xn' _next_tags
+bindkey '^Xt' _complete_tag
+bindkey '^X~' _bash_list-choices
+bindkey '^[,' _history-complete-newer
+bindkey '^[/' _history-complete-older
+bindkey '^[~' _bash_complete-word
+
+autoload -Uz _a2ps _a2utils _aap _acpi _acpitool \
+            _acroread _alias _aliases _all_labels _all_matches \
+            _alternative _analyseplugin _ant _antiword _apachectl \
+            _apm _approximate _apt _apt-file _apt-move \
+            _apt-show-versions _aptitude _arch_archives _arch_namespace _arg_compile \
+            _arguments _arp _arping _arrays _assign \
+            _attr _auto-apt _autocd _awk _bash_completions \
+            _baz _bind_addresses _bindkey _bison _bittorrent \
+            _bogofilter _brace_parameter _brctl _bsd_pkg _bts \
+            _bug _builtin _bzip2 _bzr _cache_invalid \
+            _cal _calendar _call_function _canonical_paths _ccal \
+            _cd _cdbs-edit-patch _cdcd _cdrdao _cdrecord \
+            _chflags _chkconfig _chmod _chown _chrt \
+            _combination _comm _command _command_names _compdef \
+            _complete _complete_debug _complete_help _complete_help_generic _complete_tag \
+            _compress _condition _configure _correct _correct_filename \
+            _correct_word _cowsay _cp _cpio _cplay \
+            _cssh _csup _ctags_tags _cut _cvs \
+            _cvsup _cygcheck _cygpath _cygrunsrv _cygserver \
+            _cygstart _dak _darcs _date _dchroot \
+            _dchroot-dsa _dcop _dd _deb_packages _debchange \
+            _debdiff _debfoster _debsign _default _defaults \
+            _delimiters _describe _description _dhclient _dict \
+            _dict_words _diff _diff_options _diffstat _dir_list \
+            _directories _directory_stack _dirs _disable _dispatch \
+            _django _dlocate _dmidecode _domains _dpatch-edit-patch \
+            _dpkg _dpkg-buildpackage _dpkg-cross _dpkg-repack _dpkg_source \
+            _dput _du _dumper _dupload _dvi \
+            _dynamic_directory_name _ecasound _echotc _echoti _elinks \
+            _elm _email_addresses _emulate _enable _enscript \
+            _env _equal _ethtool _expand _expand_alias \
+            _expand_word _fakeroot _fc _fetch _fetchmail \
+            _figlet _file_descriptors _file_systems _files _find \
+            _finger _fink _first _flasher _flex \
+            _floppy _fortune _freebsd-update _fsh _functions \
+            _fuse_arguments _fuse_values _fuser _fusermount _gcc \
+            _gdb _generic _genisoimage _getclip _getconf \
+            _getent _getfacl _getmail _git _global \
+            _global_tags _globqual_delims _globquals _gnome-gv _gnu_generic \
+            _gnupod _gnutls _gpg _gphoto2 _gprof \
+            _gqview _grep _grep-excuses _groff _groups \
+            _growisofs _gs _guard _guilt _gv \
+            _gzip _hash _hdiutil _history _history_complete_word \
+            _history_modifiers _hosts _iconv _id _ifconfig \
+            _iftop _ignored _imagemagick _in_vared _init_d \
+            _invoke-rc.d _ionice _ip _ipset _iptables \
+            _irssi _ispell _iwconfig _java _java_class \
+            _jobs _jobs_bg _jobs_builtin _jobs_fg _joe \
+            _join _kfmclient _kill _killall _kld \
+            _knock _kvno _last _ldd _less \
+            _lighttpd _limit _limits _linda _links \
+            _lintian _list _list_files _loadkeys _locales \
+            _locate _logical_volumes _look _losetup _lp \
+            _ls _lscfg _lsdev _lslv _lsof \
+            _lspv _lsusb _lsvg _lynx _lzop \
+            _mac_applications _mac_files_for_application _madison _mail _mailboxes \
+            _main_complete _make _make-kpkg _man _match \
+            _math _md5sum _members _mencal _menu \
+            _mercurial _mere _mergechanges _message _metaflac \
+            _mh _mii-tool _mime_types _mkdir _mkshortcut \
+            _mkzsh _module _module-assistant _modutils _mondo \
+            _monotone _most_recent_file _mount _mozilla _mpc \
+            _mplayer _mt _mtools _mtr _multi_parts \
+            _mutt _my_accounts _mysql_utils _mysqldiff _nautilus \
+            _ncftp _nedit _net_interfaces _netcat _netscape \
+            _newsgroups _next_label _next_tags _nice _nmap \
+            _normal _nothing _nslookup _object_classes _oldlist \
+            _open _options _options_set _options_unset _other_accounts \
+            _pack _parameter _parameters _patch _path_commands \
+            _path_files _pax _pbm _pdf _perforce \
+            _perl _perl_basepods _perl_modules _perldoc _php \
+            _physical_volumes _pick_variant _pids _pine _ping \
+            _piuparts _pkg-config _pkg_instance _pkgadd _pkginfo \
+            _pkgrm _pkgtool _pon _portaudit _portlint \
+            _ports _portsnap _postfix _powerd _prcs \
+            _precommand _prefix _print _printenv _printers \
+            _prompt _ps _pscp _pspdf _psutils \
+            _pump _putclip _python _qemu _qiv \
+            _qtplay _quilt _raggle _rake _ranlib \
+            _rar _rcs _read _read_comp _redirect \
+            _regex_arguments _regex_words _renice _reprepro _requested \
+            _retrieve_cache _retrieve_mac_apps _ri _rlogin _rm \
+            _rpm _rrdtool _rsync _rubber _ruby \
+            _sablotron _samba _sccs _sched _schroot \
+            _screen _sed _sep_parts _service _services \
+            _set _set_command _setopt _setup _sh \
+            _showmount _signals _sisu _slrn _smit \
+            _socket _softwareupdate _sort _source _spamassassin \
+            _sqsh _ssh _sshfs _stat _stgit \
+            _store_cache _strace _strip _stty _su \
+            _sub_commands _subscript _subversion _sudo _suffix_alias_files \
+            _surfraw _svn-buildpackage _sysctl _tags _tar \
+            _tar_archive _tardy _tcpdump _tcpsys _tcptraceroute \
+            _telnet _terminals _tex _texi _texinfo \
+            _tidy _tiff _tilde _tilde_files _time_zone \
+            _tin _tla _todo.sh _toilet _toolchain-source \
+            _totd _tpb _tpconfig _tracepath _trap \
+            _ttyctl _tune2fs _twisted _typeset _ulimit \
+            _uml _unace _uname _unexpand _unhash \
+            _uniq _units _unsetopt _update-alternatives _update-rc.d \
+            _urls _urpmi _urxvt _uscan _user_admin \
+            _user_at_host _users _users_on _valgrind _value \
+            _values _vared _vars _vim _vim-addons \
+            _vnc _volume_groups _vorbis _vorbiscomment _vserver \
+            _vux _w3m _wait _wajig _wakeup_capable_devices \
+            _wanna-build _wanted _webbrowser _wget _whereis \
+            _which _whois _wiggle _x_arguments _x_borderwidth \
+            _x_color _x_colormapid _x_cursor _x_display _x_extension \
+            _x_font _x_geometry _x_keysym _x_locale _x_modifier \
+            _x_name _x_resource _x_selection_timeout _x_title _x_utils \
+            _x_visual _x_window _xargs _xauth _xdvi \
+            _xfig _xloadimage _xmlsoft _xmodmap _xpdf \
+            _xrandr _xscreensaver _xset _xt_arguments _xt_session_id \
+            _xterm _xv _xwit _yast _yodl \
+            _yp _yum _zcalc_line _zcat _zcompile \
+            _zdump _zed _zfs _zfs_dataset _zfs_pool \
+            _zftp _zip _zle _zmodload _zmv \
+            _zpool _zpty _zstyle
+autoload -Uz +X _call_program
+
+typeset -gUa _comp_assocs
+_comp_assocs=( '' )
diff --git a/zsh/.zshrc b/zsh/.zshrc
new file mode 120000
index 0000000..c8b42f4
--- /dev/null
+++ b/zsh/.zshrc
@@ -0,0 +1 @@
+zshrc
\ No newline at end of file
diff --git a/zsh/.zshrc~ b/zsh/.zshrc~
new file mode 100755
index 0000000..945be9b
--- /dev/null
+++ b/zsh/.zshrc~
@@ -0,0 +1,529 @@
+# contents: zsh(1) user RC file.
+# this file is sourced by all interactive shells
+
+# 1. Environment Vars {{{1
+# ====================
+# (sh|c)ould be set in .zshenv but /etc/zprofile blows $PATH away on Gentoo
+
+export LC_ALL="en_CA.UTF-8"
+export LANG="en_CA.UTF-8"
+
+# include my script directory in the path
+path=($HOME/bin /usr/local/bin /usr/local/sbin $path)
+export PATH="/usr/local/bin:/usr/local/sbin:$PATH"
+cdpath=(~)
+
+HOSTNAME=`hostname -s`
+source /sw/bin/init.sh
+KEYCHAIN_HOST=`hostname`
+
+# make Esc-h show individual zshbuiltins entries
+#HELPDIR=~/.zsh/help
+#unalias run-help
+#autoload -U run-help
+
+if [[ `uname` = "Linux" ]]; then
+    export JAVA="/opt/blackdown-jdk-1.4.2/bin/java"
+    export JAVA_HOME="/opt/blackdown-jdk-1.4.2"
+fi
+
+export PAGER="/usr/bin/less"
+# most has great colours for man pages
+if which most >/dev/null 2>&1; then
+    export MANPAGER="/usr/bin/most"
+fi
+
+# default editors
+export EDITOR="mate -w"
+export VISUAL=$EDITOR
+
+# Dynamically build the $PATH variable
+#for dircomponent in /bin /sbin \
+#	/usr/bin /usr/sbin /usr/local/bin /usr/local/sbin \
+#    /usr/games/bin /usr/X11R6/bin /usr/X11R6/sbin
+#  do
+#  if [[ -e $dircomponent ]]; then
+#      path=($path $dircomponent)
+#  fi
+#done
+typeset -U path     # remove dups
+#unset dircomponent
+
+# 1}}}
+
+# 2. Limits {{{1
+# =========
+#limit coredumpsize		30m		# limit core dumps to 30mb
+#limit stacksize	    8m		# limit stack to 8mb
+
+# 1}}}
+
+# 3. Shell Settings {{{1
+# =================
+
+# 3.1. Shell Directories {{{2
+# ----------------------
+hash -d mail=~/.maildir/
+
+# 2}}}
+
+# 1}}}
+
+# 4. Shell Options {{{1
+# ================
+
+# 4.1. Parameters and Shell Functionality {{{2
+# ---------------------------------------
+#setopt no_globalexport		# don't be backwards compatible
+#setopt ignoreeof			# ignore EOF ('^D') (i.e. don't log out on it)
+setopt braceccl				# {a-d} expands to a b c d
+
+# 2}}}
+
+# 4.2. Changing Directories {{{2
+# -------------------------
+setopt autocd				# automatically cd to a directory if not cmd
+setopt autopushd			# automatically pushd directories on dirstack
+#setopt pushdignoredups		# don't push dups on stack
+#setopt pushdsilent			# be quiet about pushds and popds
+
+# 2}}}
+
+# 4.3. Shell Completion {{{2
+# ---------------------
+#setopt automenu			# use menu completion after 2 tabs
+#setopt completeinword		# complete inside words
+setopt correct				# try to correct spelling...
+setopt no_correctall		# ...only for commands, not filenames
+#setopt no_listambiguous		# only list matches if ambiguous
+setopt no_listbeep			# don't beep on ambiguous listings
+setopt listpacked			# diff col widths = less space
+
+# 2}}}
+
+# 4.4. Shell Expansion and Globbing {{{2
+# ---------------------------------
+#setopt no_nomatch			# don't generate 'no matches' error 
+setopt extendedglob			# use extended globbing (#, ~, ^)
+#setopt cshnullglob			# overrides nomatch
+#setopt equals				# expand =cmd (on by default)
+#setopt markdirs			# append / to dir names generated by globbing
+
+# 2}}}
+
+# 4.5. History and History Expansion {{{2
+# ----------------------------------
+setopt extendedhistory		# save timestamps in history
+setopt no_histbeep			# don't beep for erroneous history expansions
+setopt no_histignorealldups	# don't ignore dups in history
+setopt histignoredups		# ignore consecutive dups in history
+setopt histsavenodups			# don't save duplicates
+setopt histnostore			# don't store history related functions
+#setopt incappendhistory		# incrementally add items to hist.
+#setopt histverify
+#setopt sharehistory			# imports from history file and exports (like incappendhistory)
+
+# 2}}}
+
+# 4.6. Job Control {{{2
+# ----------------
+setopt longlistjobs			# list jobs in long format
+#setopt no_notify			# report job status only before prompt printing
+
+# 2}}}
+
+# 4.7. Shell Prompt {{{2
+# -----------------
+#setopt promptsubst		# allow paramater, command, so on in prompt
+
+# 2}}}
+
+# 4.8. ZLE {{{2
+# --------
+setopt no_beep			# don't beep on errors (in ZLE)
+
+# 2}}}
+
+# 4.9. Input and Output {{{2
+# ---------------------
+setopt no_flowcontrol		# don't use flow control (^S/^Q)
+#setopt printeightbit		# allow eight bit output for completion lists
+
+# 2}}}
+
+# 1}}}
+
+# 5. Terminal Settings {{{1
+# ====================
+
+# 5.1. Terminal Input {{{2
+# -------------------
+#stty -ixon			# don't use flow control
+#stty pass8			# but do send 8-bit characters to terminal
+
+#unset TERMCAP
+
+# 2}}}
+
+# 5.2. Terminal Output {{{2
+# --------------------
+#case $TERM in
+#  *screen*|rxvt|*xterm|aterm) echo -e -n "\033[10;0]\033[11;0]" ;;
+#esac
+
+# 2}}}
+
+# 5.3. Screen Title Updating {{{2
+# --------------------------
+
+function title {
+	if [[ $TERM == "screen" ]]; then
+		# Use these two for GNU Screen:
+		print -nR $'\033k'$1$'\033'\\\
+
+		print -nR $'\033]0;'$2$'\a'
+	elif [[ $TERM == "xterm" || $TERM == "rxvt" ]]; then
+		# Use this one instead for XTerms:
+		print -nR $'\033]0;'$*$'\a'
+	fi
+}
+  
+function precmd {
+	title zsh "$PWD"
+	print -n '\017'
+}
+  
+function preexec {
+	emulate -L zsh
+	local -a cmd; cmd=(${(z)1})
+	title $cmd[1]:t "$cmd[2,-1]"
+}
+
+# 2}}}
+
+# 1}}}
+
+# 6. Modules {{{1
+# ==========
+
+# 6.1. Default ZSH Modules {{{2
+# ------------------------
+
+# 2}}}
+
+# 6.2. ZFTP {{{2
+# ---------
+
+# 2}}}
+
+# 1}}}
+
+# 7. Command-line Completion {{{1
+# ==========================
+
+# 7.1. Startup {{{2
+# ------------
+autoload -U colors			# we need the colors for some formats below
+colors
+
+# 2}}}
+
+# 7.2. Completion Styles {{{2
+# ----------------------
+
+# 7.2.1. Caching {{{3
+
+# 3}}}
+
+# 7.2.2. Completers {{{3
+
+# 3}}}
+
+# 7.2.3. Completer Options {{{3
+
+# 3}}}
+
+# 7.2.4. Selection Display {{{3
+
+# 3}}}
+
+# 7.2.5. Specific Commands {{{3
+
+# 3}}}
+
+# 2}}}
+
+# 7.3. Completion Formats and Messages {{{2
+# ------------------------------------
+
+# 2}}}
+
+# 7.4. Completion Groups {{{2
+# ----------------------
+
+# 2}}}
+
+# 7.5. Completion Function Usage {{{2
+# ------------------------------
+
+# 2}}}
+
+# 7.6. History Completion {{{2
+# -----------------------
+
+# 2}}}
+# 1}}}
+
+# 8. ZLE Keybindings {{{1
+# ==================
+
+# 8.1. Searching {{{2
+bindkey '\ep' history-beginning-search-backward
+# 2}}}
+# 1}}}
+
+# 9. Function (Auto)loading {{{1
+# =========================
+
+# 9.1. Prompt Subsystem {{{2
+# ---------------------
+
+# PROMPT SUBTITUTION
+# ------------------
+# %l - tty		%M - full machine hostname
+# %m - hostname		%n - USERNAME
+# %y - tty w/ prefix	%# - # or $
+# %? - last exit code	%d,%/ - PWD
+# %~ - ~ for home etc	%h,%! - history event #
+# %j - # of jobs
+#
+# %B - bold		%E - clear to EOL
+# %U - underline	%S - standout
+#
+# %([n]x.true.false) '.' is arbitrary
+# 'x' can be:
+#   ! - running with privs
+#   # - effective uid is 'n'
+#   ? exit status was 'n'
+#   C
+#   / - PWD has >= 'n' elements
+#   c
+#   .
+#   ~ - PWD with prefix replacements has >= 'n' elements
+#   D - month = 'n' (jan = 0)
+#   d - day of month = 'n'
+#   g - gid is 'n'
+#   j - # jobs >= 'n'
+#   l - 'n' chars already printed on line
+#   T - hours = 'n'
+#   t - minutes = 'n'
+#   w - day of week = 'n' (sun = 0)
+
+#export PROMPT=$'%B%?%b %{\e[01;32m%}%n %{\e[01;34m%}%~ %# %{\e[0m%}'
+case $HOSTNAME in
+    tuono)
+        export PROMPT=$'%(?..%{\e[41;38m%}%B-%?-%b%{\e[0m%} )%(1j.%{\e[01;33m%}[%j] .)%{\e[01;44m%}%n@%m%{\e[0m%} %{\e[01;32m%}%3~%{\e[0m%} %B%#%b '
+        ;;
+
+    mac-mini)
+        export PROMPT=$'%(?..%{\e[41;38m%}%B-%?-%b%{\e[0m%} )%(1j.%{\e[01;33m%}[%j] .)%{\e[01;34m%}%n@%m%{\e[0m%} %{\e[01;32m%}%3~%{\e[0m%} %B%#%b '
+        ;;
+
+    slick)
+        export PROMPT=$'%(?..%{\e[41;38m%}%B-%?-%b%{\e[0m%} )%(1j.%{\e[01;33m%}[%j] .)%{\e[01;31m%}%n@%m%{\e[0m%} %{\e[01;32m%}%3~%{\e[0m%} %B%#%b '
+        ;;
+    *)
+        export PROMPT=$'%(?..%{\e[41;38m%}%B-%?-%b%{\e[0m%} )%(1j.%{\e[01;33m%}[%j] .)%{\e[01;32m%}%n@%m%{\e[0m%} %{\e[01;32m%}%3~%{\e[0m%} %B%#%b '
+        ;;
+esac
+
+#export RPROMPT=$'%{\e[01;31m%}[%!]%{\e[0m%}'		# time & history # on right
+
+# 2}}}
+
+# 1}}}
+
+# 10. Aliases {{{1
+# ===========
+
+# 10.1. Convenience Aliases/Macros {{{2
+# --------------------------------
+#alias burn='cdrecord -dao -driveropts=burnfree -dev=ATA:1,1,0 -v'
+alias cp='nocorrect cp'            # don't correct spelling for 'cp'
+alias cron='crontab -e'
+#alias dispatch-conf='sudo dispatch-conf'
+#alias emerge='sudo emerge'         # should've thought of this
+alias mkdir='nocorrect mkdir'      # don't correct spelling for 'mkdir'
+alias mv='nocorrect mv'            # don't correct spelling for 'mv'
+#alias ns='newscript'
+#alias perldoc='LC_ALL=en_US perldoc'
+#alias reboot='sudo shutdown -r now'
+#alias shutdown='sudo shutdown -h now'
+#alias ssh='ssh -X'
+#alias u='cd ..'
+#alias u2='cd ../..'
+#alias u3='cd ../../..'
+#alias u4='cd ../../../..'
+
+# ruby
+alias irb='irb --readline -r irb/completion'
+alias rii='ri -Tf ansi'
+
+# rails
+alias ss='./script/server'
+alias sc='./script/console'
+alias mig='rake migrate'
+alias gcon='./script/generate controller'
+alias gmod='./script/generate model'
+alias gmig='./script/generate migration'
+alias gsca='./script/generate scaffold'
+
+# svn
+alias sup='svn update'
+alias sst='svn status -u'
+alias scom='svn commit'
+alias slog='svn log | less'
+
+# textmate
+alias e='mate'
+alias et='mate .'
+
+# global aliases - work anywhere on line
+alias -g L='|less'
+alias -g G='|grep'
+alias -g SH='>/dev/null 2>&1'
+
+# suffix aliases, 'alias -s ps=gv' makes '*.ps' expand to 'gv *.ps'
+# (globbing done after alias expansion!)
+#alias -s c=gvim
+#alias -s h=gvim
+#alias -s py=gvim
+#alias -s html=gvim
+#alias -s css=gvim
+
+function cd () {
+  if [[ -f $1 ]]; then
+    builtin cd $1:h
+  else
+    builtin cd $1
+  fi
+}
+
+function cl () {
+  cd $1
+  ls
+}
+
+# 2}}}
+
+# 10.2. ls Aliases {{{2
+# ----------------
+alias ls='ls -BF'
+alias la='/bin/ls -AF'
+alias ll='ls -l'
+alias lsd='ls -d'
+
+# 2}}}
+
+# 10.5. Miscellaneous Aliases {{{2
+# ---------------------------
+
+# 2}}}
+
+# 1}}}
+
+# 11. Unsorted (new) stuff {{{1
+# ========================
+
+export HISTFILE="$ZDOTDIR/zhistory"  # save history
+export HISTSIZE=100000
+export SAVEHIST=100000             # huge history buffer
+
+# if commands takes more than 60 seconds tell me how long it took
+export REPORTTIME=60
+
+# use less instead of the default more when no cmd is specified
+export READNULLCMD=less
+
+# use vim for info pages too
+#info() { vim "+Info $1" +only; }
+
+# set shell options
+setopt autonamedirs				# % export h=/home/sjs; cd ~h; pwd
+								# /home/sjs
+setopt no_badpattern			# supress err msgs
+setopt cbases					# 0xFF instead of 16#FF
+setopt cdablevars				# blah=~/media/movies; cd blah; pwd => ~/media/movies
+#setopt globdots					# match '.' implicitly
+setopt globsubst				# parameter expns eligible for filename expn & generation
+setopt interactivecomments		# comments allowed in interactive shells
+setopt no_hup					# leave bg tasks running (a la nohup)
+#setopt multios					# no more tee! (on by default)
+#setopt	magicequalsubst			# performs filename expansion on 'arg' part of
+								#  foo=arg parameters.
+
+#bindkey -v                      # vi style key bindings
+bindkey -e                      # emacs style key bindings
+bindkey '^I' complete-word      # complete on tab, leave expansion to _expand
+
+# default in linux is backspace sends ^H, emacs no likey
+#stty erase '^?'
+TERMINFO=$HOME/.terminfo
+
+# tell gentoo's mozilla-launcher script to open tabs
+MOZILLA_NEWTYPE=tabs
+
+function keep {
+    setopt localoptions nomarkdirs nonomatch nocshnullglob nullglob
+    kept=()         # Erase old value in case of error on next line
+    kept=($~*)
+    if [[ ! -t 0 ]]; then
+        local line
+        while read line; do
+            kept+=( $line )         # += is a zsh 4.2+ feature
+        done
+    fi
+print -Rc - ${^kept%/}(T)
+}
+alias keep='noglob keep '
+
+# 1}}}
+
+# more verbose completion prompt
+zstyle ':completion:*' format '%SCompleting %U%d%u%s'
+zstyle :completion::complete:cd:: tag-order \
+        local-directories path-directories
+
+# The following lines were added by compinstall
+
+zstyle ':completion:*' auto-description 'specify %d:'
+zstyle ':completion:*' completer _expand _complete _files
+zstyle ':completion:*' expand prefix
+#zstyle ':completion:*' format 'Complete %d:'
+zstyle ':completion:*' group-name ''
+zstyle ':completion:*' list-colors ${(s.:.)LS_COLORS}
+zstyle ':completion:*' list-prompt %SAt %p: Hit TAB for more, or the character to insert%s
+zstyle ':completion:*' list-suffixes true
+zstyle ':completion:*' matcher-list 'r:|[._-]=* r:|=*' 'r:|[._-]=* r:|=*' 'r:|[._-]=* r:|=*' 'r:|[._-]=* r:|=*'
+#zstyle ':completion:*' max-errors 2
+zstyle ':completion:*' menu select=0
+zstyle ':completion:*' select-prompt %SScrolling active: current selection at %p%s
+zstyle ':completion:*' verbose true
+zstyle :compinstall filename '/home/sjs/.zsh/.zshrc'
+
+autoload -Uz compinit
+compinit
+# End of lines added by compinstall
+
+#autoload -u promptinit
+#promptinit
+#prompt gentoo
+
+if which keychain >/dev/null 2>&1; then
+    /usr/bin/keychain ~/.ssh/id_rsa
+    source ~/.keychain/${KEYCHAIN_HOST}-sh > /dev/null
+fi
+
+export LC_ALL="en_CA.UTF-8"
+export LANG="en_CA.UTF-8"
+# vim: set fdm=marker fdl=3 foldminlines=3 :
diff --git a/zsh/completion/_figlet b/zsh/completion/_figlet
new file mode 100755
index 0000000..4802069
--- /dev/null
+++ b/zsh/completion/_figlet
@@ -0,0 +1,47 @@
+#compdef figlet
+
+typeset -A opt_args
+local context state line
+local fontdir
+fontdir=$(_call_program path figlet -I2 2>/dev/null)
+
+_arguments -s -S \
+    "(-l -c -r)-x[use default justification of font]" \
+    "(-x -c -r)-l[left justify]" \
+    "(-x -l -r)-c[center justify]" \
+    "(-x -l -c)-r[right justify]" \
+    "(-S -s -o -W -m)-k[use kerning]" \
+    "(-k -s -o -W -m)-S[smush letters together or else!]" \
+    "(-k -S -o -W -m)-s[smushed spacing]" \
+    "(-k -S -s -W -m)-o[let letters overlap]" \
+    "(-k -S -s -o -m)-W[wide spacing]" \
+    "(-p)-n[normal mode]" \
+    "(-n)-p[paragraph mode]" \
+    "(-E)-D[use Deutsch character set]" \
+    "(-D)-E[use English character set]" \
+    "(-X -R)-L[left-to-right]" \
+    "(-L -X)-R[right-to-left]" \
+    "(-L -R)-X[use default writing direction of font]" \
+    "(-w)-t[use terminal width]" \
+    "(-t)-w+[specify output width]:output width (in columns):" \
+    "(-k -S -s -o -W)-m+[specify layout mode]:layout mode:" \
+    "(-I)-v[version]" \
+    "(-v)-I+[display info]:info code:(-1 0 1 2 3 4)" \
+    "-d+[specify font directory]:font directory:_files -/" \
+    "-f+[specify font]:font:->fonts" \
+    "(-N)-C+[specify control file]:control file:->controls" \
+    "(-C)-N[clear controlfile list]" \
+    && return 0
+
+(( $+opt_args[-d] )) && fontdir=$opt_args[-d]
+
+case $state in
+   (fonts)
+     _files -W $fontdir -g '*flf*(:r)' && return 0
+     ;;
+   (controls)
+     _files -W $fontdir -g '*flc*(:r)' && return 0
+     ;;
+esac
+
+return 1
diff --git a/zsh/zsh b/zsh/zsh
new file mode 120000
index 0000000..4cf5c05
--- /dev/null
+++ b/zsh/zsh
@@ -0,0 +1 @@
+~/config/zsh
\ No newline at end of file
diff --git a/zsh/zshrc b/zsh/zshrc
new file mode 100755
index 0000000..415b712
--- /dev/null
+++ b/zsh/zshrc
@@ -0,0 +1,470 @@
+# contents: zsh(1) user RC file.
+# this file is sourced by all interactive shells
+
+# 1. Environment Vars
+# ===================
+
+export LC_ALL="en_CA.UTF-8"
+export LANG="en_CA.UTF-8"
+
+cdpath=(~)
+
+function linux() { [[ `uname -s` = "Linux"  ]] && true }
+function mac()   { [[ `uname -s` = "Darwin" ]] && true }
+
+HOSTNAME=`hostname -s`
+KEYCHAIN_HOST=`hostname`
+
+export PAGER=`which less`
+# most has great colours for man pages
+if which most >/dev/null 2>&1; then
+    export MANPAGER=`which most`
+fi
+
+# default editors
+if mac; then
+  export EDITOR="emacs"
+  export VISUAL="mate -w"
+elif linux; then
+  export EDITOR="emacs -nw"
+  export VISUAL="emacs"
+fi
+
+
+# 2. Limits
+# =========
+#limit coredumpsize        30m          # limit core dumps to 30mb
+limit stacksize            8m          # limit stack to 8mb
+
+# 3. Shell Options
+# ================
+
+# 3.1. Parameters and Shell Functionality
+# ---------------------------------------
+#setopt ignoreeof           # ignore EOF ('^D') (i.e. don't log out on it)
+setopt braceccl             # {a-d} expands to a b c d
+setopt noclobber            # don't overwrite existing files w/ > output redir
+setopt hist_allow_clobber   # C-p or UP and command has >| now, ready to go
+
+# 3.2. Changing Directories
+# -------------------------
+setopt autocd               # automatically cd to a directory if not cmd
+setopt autopushd            # automatically pushd directories on dirstack
+setopt nopushdsilent        # print dirstack after each cd/pushd
+setopt pushdignoredups      # don't push dups on stack
+
+# need to find out the difference between these two, just the export?
+setopt autonamedirs             # % export h=/home/sjs; cd ~h; pwd
+                                # => /home/sjs
+setopt cdablevars               # blah=~/media/movies; cd blah; pwd => ~/media/movies
+
+# 3.3. Shell Completion
+# ---------------------
+setopt correct              # try to correct spelling...
+setopt no_correctall        # ...only for commands, not filenames
+setopt no_listbeep          # don't beep on ambiguous listings
+setopt listpacked           # variable col widths (takes up less space)
+
+
+# 3.4. Shell Expansion and Globbing
+# ---------------------------------
+setopt extendedglob         # use extended globbing (#, ~, ^)
+
+
+# 3.5. History and History Expansion
+# ----------------------------------
+export HISTFILE="$ZDOTDIR/zhistory"    # save history
+export HISTSIZE=100000                 # huge internal buffer
+export SAVEHIST=100000                 # huge history file
+
+setopt extendedhistory      # save timestamps in history
+setopt no_histbeep          # don't beep for erroneous history expansions
+setopt histignoredups       # ignore consecutive dups in history
+setopt histfindnodups       # backwards search produces diff result each time
+setopt histreduceblanks     # compact consecutive white space chars (cool)
+setopt histnostore          # don't store history related functions
+setopt incappendhistory     # incrementally add items to HISTFILE
+# this is very annoying
+#setopt histverify           # confirm !: or ^ command results before execution
+
+
+# 3.6. Job Control
+# ----------------
+setopt longlistjobs         # list jobs in long format
+
+
+# 3.7. Shell Prompt
+# -----------------
+setopt promptsubst          # allow paramater, command, so on in prompt
+setopt transient_rprompt    # hide RPROMPT after cmdline is executed
+
+
+# 3.8. ZLE
+# --------
+setopt no_beep          # don't beep on errors (in ZLE)
+
+# when completing and then typing | > etc. don't delete
+# the preceding space
+self-insert-redir() {
+    integer l=$#LBUFFER
+    zle self-insert
+    (( $l >= $#LBUFFER )) && LBUFFER[-1]=" $LBUFFER[-1]"
+}
+zle -N self-insert-redir
+for op in \| \< \> \&
+  do bindkey "$op" self-insert-redir
+done
+
+
+
+# 4. Terminal Settings 
+# ====================
+
+function precmd {
+    rehash
+}
+
+autoload -U colors            # we need the colors for some formats below
+colors
+
+
+# 5. ZLE Keybindings
+# ==================
+bindkey '\ep' history-beginning-search-backward
+
+
+# 6. Prompt Subsystem
+# ===================
+
+# define some colours to use in english instead of ANSI
+# notation:
+#  -background is black unless the var is named colourOnBlue
+#  -prefix of b, e.g. bGreen means bright green
+none='%{\e[0m%}'
+
+red='%{\e[40;31m%}'
+green='%{\e[40;32m%}'
+yellow='%{\e[40;33m%}'
+blue='%{\e[40;34m%}'
+purple='%{\e[40;35m%}'
+cyan='%{\e[40;36m%}'
+white='%{\e[40;37m%}'
+grey='%{\e[1;40;30m%}'
+
+bRed='%{\e[1;40;31m%}'
+bGreen='%{\e[1;40;32m%}'
+bYellow='%{\e[1;40;33m%}'
+bBlue='%{\e[1;40;34m%}'
+bPurple='%{\e[1;40;35m%}'
+bCyan='%{\e[1;40;36m%}'
+bWhite='%{\e[1;40;37m%}'
+
+whiteOnRed='%{\e[41;37m%}'
+whiteOnBlue='%{\e[44;37m%}'
+bWhiteOnRed='%{\e[1;41;37m%}'
+
+# PROMPT SUBTITUTION
+# ------------------
+# %l - tty        %M - full machine hostname
+# %m - hostname       %n - USERNAME
+# %y - tty w/ prefix  %# - # or %
+# %? - last exit code %d,%/ - PWD
+# %~ - ~ for home etc %h,%! - history event #
+# %j - # of jobs
+#
+# %B - bold       %E - clear to EOL
+# %U - underline  %S - standout
+#
+# %([n]x.true.false) '.' is arbitrary
+# 'x' can be:
+#   ! - running with privs
+#   # - effective uid is 'n'
+#   ? exit status was 'n'
+#   C
+#   / - PWD has >= 'n' elements
+#   c
+#   .
+#   ~ - PWD with prefix replacements has >= 'n' elements
+#   D - month = 'n' (jan = 0)
+#   d - day of month = 'n'
+#   g - gid is 'n'
+#   j - # jobs >= 'n'
+#   l - 'n' chars already printed on line
+#   T - hours = 'n'
+#   t - minutes = 'n'
+#   w - day of week = 'n' (sun = 0)
+
+# looks like:
+# user@host%                [~]
+#
+# non-zero exit code:
+# -1- user@host%            [~]
+#
+# jobs running:
+# [1] user@host%            [~]
+
+eval exitCode='%(0?..${bWhiteOnRed}-%?-${none} )'
+eval dirpath='${bGreen}%(4~!.../%3~!%~)${none}'
+eval job='%(1j.${bYellow}[%j] .)'
+#hist="${whiteOnBlue}%5h${none}|"
+eval user='%(0#.${bRed}.${bBlue})%n${none}'
+eval at='${grey}@${none}'
+
+case $HOSTNAME in
+macbook)
+    host="${cyan}"
+    ;;
+
+samis-hackintosh)
+    host="${bWhite}"
+    ;;
+
+slick)
+    host="${bRed}"
+    ;;
+
+*)
+    host="${bGreen}"
+    ;;
+esac
+
+eval host='${host}%m${none}'
+
+# moved dir to rprompt
+#PROMPT=`echo -n "${hist}${exitCode}${job}${user}${at}${host}${grey}:${none}${dirpath}${bWhite}%#${none} "`
+
+if [[ "x$INSIDE_EMACS" != "x" ]] || [[ "$EMACS" = "t" ]]; then
+    export PROMPT="%d %% "
+    export PAGER=cat
+    export MANPAGER=cat
+else
+    PROMPT=`echo -n "${exitCode}${job}${user}${at}${host}${bWhite}%#${none} "`
+    RPROMPT=`echo -n "${blue}[${dirpath}${blue}]${none} %t"`
+    eval export PROMPT=$'${PROMPT}'
+fi
+
+# PROMPT=`echo -n "${exitCode}${job}${user}${at}${host}${bWhite}%#${none} "`
+# eval export PROMPT=$'${PROMPT}'
+# RPROMPT=`echo -n "${blue}[${dirpath}${blue}]${none} %t"`
+
+
+# 7. Aliases
+# ===========
+
+# 7.1. Convenience Aliases/Macros
+# --------------------------------
+#alias burn='cdrecord -dao -driveropts=burnfree -dev=ATA:1,1,0 -v'
+alias bgd='bg; disown %1'
+alias cp='nocorrect cp'            # don't correct spelling for 'cp'
+alias cron='crontab -e'
+#alias dispatch-conf='sudo dispatch-conf'
+alias ec="$EDITOR ~/config/"
+alias ev="$EDITOR ~/config/vim/vimrc"
+alias ez="$EDITOR ~/config/zsh/zshrc"
+
+alias hide='sudo /Developer/Tools/SetFile -a VP'
+alias mkdir='nocorrect mkdir'      # don't correct spelling for 'mkdir'
+alias mv='nocorrect mv'            # don't correct spelling for 'mv'
+#alias ns='newscript'
+#alias perldoc='LC_ALL=en_US perldoc'
+#alias reboot='sudo shutdown -r now'
+#alias shutdown='sudo shutdown -h now'
+#alias ssh='ssh -X'
+alias u='cd ..'
+alias uu='cd ../..'
+alias uuu='cd ../../..'
+alias uuuu='cd ../../../..'
+alias u2='uu'
+alias u3='uuu'
+alias u4='uuuu'
+
+# ruby
+alias irb='irb --readline -r irb/completion'
+alias rii='ri -Tf ansi'
+
+# rails
+alias ss='./script/server'
+alias sc='./script/console'
+alias km='kill `cat tmp/pids/mongrel.pid`'
+
+# svn
+alias sup='svn update'
+alias sst='svn status -u'
+alias scom='svn commit'
+alias slog='svn log | less'
+
+# git
+alias a='git add'
+alias c='git commit'
+alias g='git'
+alias b='git branch'
+alias co='git checkout'
+alias d='git diff'
+alias dc='git diff --cached'
+alias g='git grep'
+alias m='git merge'
+alias s='git status'
+
+function svnst() {
+    tmpfile=/tmp/svn-stat.$$
+    [[ -f $tmpfile ]] && rm -f $tmpfile
+    svn stat
+    svn diff > $tmpfile
+    typeset -i added deled delta
+    added=`grep '^+' $tmpfile | wc -l`
+    deled=`grep '^-' $tmpfile | wc -l`
+    delta=$((added - deled))
+    if [[ delta -gt 0 ]]; then
+        delta_w=added
+        delta_sym='+'
+    else
+        delta_w=deleted
+        delta_sym='-'
+        delta=$((0 - delta))
+    fi
+    echo "  + ${added} lines"
+    echo "  - ${deled} lines"
+    echo "= ${delta_sym} ${delta} lines"
+    rm -f $tmpfile
+}
+
+if mac; then
+  # textmate
+  alias e='mate'
+  alias et='mate .'
+fi
+
+# global aliases - work anywhere on line
+alias -g C='|wc'
+alias -g CL='|wc -l'
+alias -g L='|less'
+alias -g H='|head'
+alias -g T='|tail'
+alias -g G='|grep'
+alias -g SH='>/dev/null 2>&1'
+alias -g BGD='& disown %1'
+
+
+# suffix aliases, 'alias -s ps=gv' makes '*.ps' expand to 'gv *.ps'
+# (globbing done after alias expansion!)
+#alias -s c=gvim
+#alias -s h=gvim
+#alias -s py=gvim
+#alias -s html=gvim
+#alias -s css=gvim
+
+function cd () {
+  if [[ -f $1 ]]; then
+    builtin cd $1:h
+  else
+    builtin cd $1
+  fi
+}
+
+function cl () {
+  cd $1
+  ls
+}
+
+
+# 7.2. ls Aliases 
+# ----------------
+alias ls='gls -BF --color=auto'
+alias la='gls -AF --color=auto'
+alias ll='ls -l'
+alias lsd='ls -d'
+alias lld='ls -dl'
+
+function like(){
+  print -l **/*${1}*{,/**}
+}
+
+
+# 8. Unsorted (new) stuff
+# =======================
+
+# if commands takes more than 60 seconds tell me how long it took
+export REPORTTIME=60
+
+# use less instead of the default more when no cmd is specified
+export READNULLCMD=less
+
+# set shell options
+setopt no_badpattern            # supress err msgs
+setopt cbases                   # 0xFF instead of 16#FF
+setopt globsubst                # parameter expns eligible for filename expn & generation
+setopt interactivecomments      # comments allowed in interactive shells
+setopt no_hup                   # leave bg tasks running (a la nohup)
+#setopt magicequalsubst         # performs filename expansion on 'arg' part of
+                                #  foo=arg parameters.
+
+bindkey -e                      # emacs style key bindings
+bindkey '^I' complete-word      # complete on tab, leave expansion to _expand
+
+# default in linux is backspace sends ^H, emacs no likey
+#stty erase '^?'
+TERMINFO=$HOME/.terminfo
+
+function keep {
+    setopt localoptions nomarkdirs nonomatch nocshnullglob nullglob
+    kept=()         # Erase old value in case of error on next line
+    kept=($~*)
+    if [[ ! -t 0 ]]; then
+        local line
+        while read line; do
+            kept+=( $line )         # += is a zsh 4.2+ feature
+        done
+    fi
+print -Rc - ${^kept%/}(T)
+}
+alias keep='noglob keep '
+
+# if [ -r "$HOME/.ruby/lib/sjs.rb" ]; then
+#   export RUBYLIB="$HOME/.ruby/lib"
+#   export RUBYOPT="rsjs"
+# fi
+
+
+# 9. Completion
+# =============
+
+# more verbose completion prompt
+zstyle ':completion:*' format '%SCompleting %U%d%u%s'
+zstyle :completion::complete:cd:: tag-order \
+        local-directories path-directories
+
+# The following lines were added by compinstall
+
+zstyle ':completion:*' auto-description 'specify %d:'
+zstyle ':completion:*' completer _expand _complete _files
+zstyle ':completion:*' expand prefix
+#zstyle ':completion:*' format 'Complete %d:'
+zstyle ':completion:*' group-name ''
+zstyle ':completion:*' list-colors ${(s.:.)LS_COLORS}
+zstyle ':completion:*' list-prompt %SAt %p: Hit TAB for more, or the character to insert%s
+zstyle ':completion:*' list-suffixes true
+zstyle ':completion:*' matcher-list 'r:|[._-]=* r:|=*' 'r:|[._-]=* r:|=*' 'r:|[._-]=* r:|=*' 'r:|[._-]=* r:|=*'
+#zstyle ':completion:*' max-errors 2
+zstyle ':completion:*' menu select=0
+zstyle ':completion:*' select-prompt %SScrolling active: current selection at %p%s
+zstyle ':completion:*' verbose true
+zstyle :compinstall filename "$ZDOTDIR/zshrc"
+
+autoload -Uz compinit
+compinit
+# End of lines added by compinstall
+
+
+# 10. SSH Keychain
+# ================
+if which keychain >/dev/null 2>&1; then
+    keychain ~/.ssh/id_rsa
+    source ~/.keychain/${KEYCHAIN_HOST}-sh > /dev/null
+else
+  echo ">>> You need to install keychain."
+  if mac; then
+    echo "try: sudo port install keychain"
+  elif linux; then
+    echo "try: sudo aptitude install keychain"
+  fi
+fi
diff --git a/zsh/zshrc~ b/zsh/zshrc~
new file mode 100755
index 0000000..befe47f
--- /dev/null
+++ b/zsh/zshrc~
@@ -0,0 +1,599 @@
+# contents: zsh(1) user RC file.
+# this file is sourced by all interactive shells
+
+# 1. Environment Vars {{{1
+# ====================
+# (sh|c)ould be set in .zshenv but /etc/zprofile blows $PATH away on Gentoo
+
+export LC_ALL="en_CA.UTF-8"
+export LANG="en_CA.UTF-8"
+
+# include my script directory in the path
+#path=($HOME/bin /opt/local/bin /usr/local/bin /usr/local/sbin $path /usr/local/mysql/bin)
+#export PATH="/usr/local/bin:/usr/local/sbin:$PATH"
+cdpath=(~)
+
+hosts=(nofxwiki.net tuono mac-mini samhuri.net samhuri@samhuri.net balltrek.net balltrek@balltrek.net nofx@firmo.mirage.org)
+
+HOSTNAME=`hostname -s`
+KEYCHAIN_HOST=`hostname`
+
+export PAGER=`which less`
+# most has great colours for man pages
+if which most >/dev/null 2>&1; then
+    export MANPAGER=`which most`
+fi
+
+# default editors
+export EDITOR="mate -w"
+export VISUAL=$EDITOR
+
+# 1}}}
+
+# 2. Limits {{{1
+# =========
+#limit coredumpsize             30m             # limit core dumps to 30mb
+#limit stacksize            8m          # limit stack to 8mb
+
+# 1}}}
+
+# 3. Shell Settings {{{1
+# =================
+
+# 3.1. Shell Directories {{{2
+# ----------------------
+hash -d mail=~/.maildir/
+
+# 2}}}
+
+# 1}}}
+
+# 4. Shell Options {{{1
+# ================
+
+# 4.1. Parameters and Shell Functionality {{{2
+# ---------------------------------------
+#setopt ignoreeof           # ignore EOF ('^D') (i.e. don't log out on it)
+setopt braceccl             # {a-d} expands to a b c d
+setopt noclobber            # don't overwrite existing files w/ > output redir
+setopt hist_allow_clobber   # C-p or UP and command has >| now, ready to go
+
+# 2}}}
+
+# 4.2. Changing Directories {{{2
+# -------------------------
+setopt autocd               # automatically cd to a directory if not cmd
+setopt autopushd            # automatically pushd directories on dirstack
+setopt nopushdsilent        # print dirstack after each cd/pushd
+setopt pushdignoredups      # don't push dups on stack
+
+# need to find out the difference between these two, just the export?
+setopt autonamedirs             # % export h=/home/sjs; cd ~h; pwd
+                                # => /home/sjs
+setopt cdablevars               # blah=~/media/movies; cd blah; pwd => ~/media/movies
+
+# 2}}}
+
+# 4.3. Shell Completion {{{2
+# ---------------------
+setopt correct              # try to correct spelling...
+setopt no_correctall        # ...only for commands, not filenames
+setopt no_listbeep          # don't beep on ambiguous listings
+setopt listpacked           # variable col widths (takes up less space)
+
+# 2}}}
+
+# 4.4. Shell Expansion and Globbing {{{2
+# ---------------------------------
+setopt extendedglob         # use extended globbing (#, ~, ^)
+
+# 2}}}
+
+# 4.5. History and History Expansion {{{2
+# ----------------------------------
+export HISTFILE="$ZDOTDIR/zhistory"  # save history
+export HISTSIZE=2000                 # big internal buffer
+export SAVEHIST=5000                 # huge history file
+
+setopt extendedhistory      # save timestamps in history
+setopt no_histbeep          # don't beep for erroneous history expansions
+setopt histignoredups       # ignore consecutive dups in history
+setopt histfindnodups       # backwards search produces diff result each time
+setopt histreduceblanks     # compact consecutive white space chars (cool)
+setopt histnostore          # don't store history related functions
+setopt incappendhistory     # incrementally add items to HISTFILE
+# this is very annoying
+#setopt histverify           # confirm !: or ^ command results before execution
+
+# 2}}}
+
+# 4.6. Job Control {{{2
+# ----------------
+setopt longlistjobs         # list jobs in long format
+
+# 2}}}
+
+# 4.7. Shell Prompt {{{2
+# -----------------
+setopt promptsubst          # allow paramater, command, so on in prompt
+setopt transient_rprompt    # hide RPROMPT after cmdline is executed
+
+
+# 2}}}
+
+# 4.8. ZLE {{{2
+# --------
+setopt no_beep          # don't beep on errors (in ZLE)
+
+# when completing and then typing | > etc. don't delete
+# the preceding space
+self-insert-redir() {
+    integer l=$#LBUFFER
+    zle self-insert
+    (( $l >= $#LBUFFER )) && LBUFFER[-1]=" $LBUFFER[-1]"
+}
+zle -N self-insert-redir
+for op in \| \< \> \&
+  do bindkey "$op" self-insert-redir
+done
+
+# 2}}}
+
+# 4.9. Input and Output {{{2
+# ---------------------
+#setopt printeightbit     # allow eight bit output for completion lists
+
+# 2}}}
+
+# 1}}}
+
+# 5. Terminal Settings {{{1
+# ====================
+
+# 5.3. Screen Title Updating {{{2
+# --------------------------
+
+#function title {
+#  if [[ $TERM == "screen" ]]; then
+#    # Use these two for GNU Screen:
+#    print -nR $'\033k'$1$'\033'\\\
+#
+#    print -nR $'\033]0;'$2$'\a'
+#  elif [[ $TERM == "xterm-color" || $TERM == "xterm" || $TERM == "rxvt" ]]; then
+#    # Use this one instead for XTerms:
+#    print -nR $'\033]0;'$*$'\a'
+#  fi
+#}
+#
+function precmd {
+    rehash
+# title zsh "$PWD"
+# print -n '\017'
+}
+#
+#function preexec {
+# emulate -L zsh
+# local -a cmd; cmd=(${(z)1})
+# title $cmd[1]:t "$cmd[2,-1]"
+#}
+
+# 2}}}
+
+# 1}}}
+
+# 6. Modules {{{1
+# ==========
+
+# 1}}}
+
+# 7. Command-line Completion {{{1
+# ==========================
+
+# 7.1. Startup {{{2
+# ------------
+    autoload -U colors            # we need the colors for some formats below
+        colors
+
+# 2}}}
+
+# 7.2. Completion Styles {{{2
+# ----------------------
+
+# 7.2.1. Caching {{{3
+
+# 3}}}
+
+# 7.2.2. Completers {{{3
+
+# 3}}}
+
+# 7.2.3. Completer Options {{{3
+
+# 3}}}
+
+# 7.2.4. Selection Display {{{3
+
+# 3}}}
+
+# 7.2.5. Specific Commands {{{3
+
+# 3}}}
+
+# 2}}}
+
+# 7.3. Completion Formats and Messages {{{2
+# ------------------------------------
+
+# 2}}}
+
+# 7.4. Completion Groups {{{2
+# ----------------------
+
+# 2}}}
+
+# 7.5. Completion Function Usage {{{2
+# ------------------------------
+
+# 2}}}
+
+# 7.6. History Completion {{{2
+# -----------------------
+
+# 2}}}
+# 1}}}
+
+# 8. ZLE Keybindings {{{1
+# ==================
+
+# 8.1. Searching {{{2
+    bindkey '\ep' history-beginning-search-backward
+# 2}}}
+# 1}}}
+
+# 9. Function (Auto)loading {{{1
+# =========================
+
+# 9.1. Prompt Subsystem {{{2
+# ---------------------
+
+# define some colours to use in english instead of ANSI
+# notation:
+#  -background is black unless the var is named colourOnBlue
+#  -prefix of b, e.g. bGreen means bright green
+none='%{\e[0m%}'
+
+red='%{\e[40;31m%}'
+green='%{\e[40;32m%}'
+yellow='%{\e[40;33m%}'
+blue='%{\e[40;34m%}'
+purple='%{\e[40;35m%}'
+cyan='%{\e[40;36m%}'
+white='%{\e[40;37m%}'
+grey='%{\e[1;40;30m%}'
+
+bRed='%{\e[1;40;31m%}'
+bGreen='%{\e[1;40;32m%}'
+bYellow='%{\e[1;40;33m%}'
+bBlue='%{\e[1;40;34m%}'
+bPurple='%{\e[1;40;35m%}'
+bCyan='%{\e[1;40;36m%}'
+bWhite='%{\e[1;40;37m%}'
+
+whiteOnRed='%{\e[41;37m%}'
+whiteOnBlue='%{\e[44;37m%}'
+bWhiteOnRed='%{\e[1;41;37m%}'
+
+# PROMPT SUBTITUTION
+# ------------------
+# %l - tty        %M - full machine hostname
+# %m - hostname       %n - USERNAME
+# %y - tty w/ prefix  %# - # or %
+# %? - last exit code %d,%/ - PWD
+# %~ - ~ for home etc %h,%! - history event #
+# %j - # of jobs
+#
+# %B - bold       %E - clear to EOL
+# %U - underline  %S - standout
+#
+# %([n]x.true.false) '.' is arbitrary
+# 'x' can be:
+#   ! - running with privs
+#   # - effective uid is 'n'
+#   ? exit status was 'n'
+#   C
+#   / - PWD has >= 'n' elements
+#   c
+#   .
+#   ~ - PWD with prefix replacements has >= 'n' elements
+#   D - month = 'n' (jan = 0)
+#   d - day of month = 'n'
+#   g - gid is 'n'
+#   j - # jobs >= 'n'
+#   l - 'n' chars already printed on line
+#   T - hours = 'n'
+#   t - minutes = 'n'
+#   w - day of week = 'n' (sun = 0)
+
+# looks like:
+# user@host%                [~]
+#
+# non-zero exit code:
+# -1- user@host%            [~]
+#
+# jobs running:
+# [1] user@host%            [~]
+
+eval exitCode='%(0?..${bWhiteOnRed}-%?-${none} )'
+eval dirpath='${bGreen}%(4~!.../%3~!%~)${none}'
+eval job='%(1j.${bYellow}[%j] .)'
+#hist="${whiteOnBlue}%5h${none}|"
+eval user='%(0#.${bRed}.${bBlue})%n${none}'
+eval at='${grey}@${none}'
+
+case $HOSTNAME in
+tuono)
+    host="${cyan}"
+    ;;
+
+macbook)
+    host="${bWhite}"
+    ;;
+
+slick)
+    host="${bRed}"
+    ;;
+
+*)
+    host="${bGreen}"
+    ;;
+esac
+
+eval host='${host}%m${none}'
+
+# moved dir to rprompt
+#PROMPT=`echo -n "${hist}${exitCode}${job}${user}${at}${host}${grey}:${none}${dirpath}${bWhite}%#${none} "`
+
+if [[ "x$INSIDE_EMACS" != "x" ]] || [[ "$EMACS" = "t" ]]; then
+    export PROMPT="%d %% "
+    export PAGER=cat
+    export MANPAGER=cat
+else
+    PROMPT=`echo -n "${exitCode}${job}${user}${at}${host}${bWhite}%#${none} "`
+    RPROMPT=`echo -n "${blue}[${dirpath}${blue}]${none} %t"`
+    eval export PROMPT=$'${PROMPT}'
+fi
+
+# PROMPT=`echo -n "${exitCode}${job}${user}${at}${host}${bWhite}%#${none} "`
+# eval export PROMPT=$'${PROMPT}'
+# RPROMPT=`echo -n "${blue}[${dirpath}${blue}]${none} %t"`
+
+# 2}}}
+
+# 1}}}
+
+# 10. Aliases {{{1
+# ===========
+
+# 10.1. Convenience Aliases/Macros {{{2
+# --------------------------------
+#alias burn='cdrecord -dao -driveropts=burnfree -dev=ATA:1,1,0 -v'
+alias bgd='bg; disown %1'
+alias cp='nocorrect cp'            # don't correct spelling for 'cp'
+alias cron='crontab -e'
+#alias dispatch-conf='sudo dispatch-conf'
+alias ec='vim ~/.config/'
+alias ev='vim ~/.config/vim/vimrc'
+alias ez='vim ~/.config/zsh/zshrc'
+#alias emerge='sudo emerge'         # should've thought of this
+alias hide='sudo /Developer/Tools/SetFile -a VP'
+alias mkdir='nocorrect mkdir'      # don't correct spelling for 'mkdir'
+alias mv='nocorrect mv'            # don't correct spelling for 'mv'
+#alias ns='newscript'
+#alias perldoc='LC_ALL=en_US perldoc'
+#alias reboot='sudo shutdown -r now'
+#alias shutdown='sudo shutdown -h now'
+#alias ssh='ssh -X'
+alias u='cd ..'
+alias uu='cd ../..'
+alias uuu='cd ../../..'
+alias uuuu='cd ../../../..'
+alias u2='uu'
+alias u3='uuu'
+alias u4='uuuu'
+
+alias bt='screen -c /Users/sjs/.screen/balltrek'
+alias ins='screen -c /Users/sjs/.screen/inspirado'
+
+# ruby
+alias irb='irb --readline -r irb/completion'
+alias rii='ri -Tf ansi'
+
+# rails
+alias ss='./script/server'
+alias sc='./script/console'
+alias km='kill `cat tmp/pids/mongrel.pid`'
+
+# svn
+alias sup='svn update'
+alias sst='svn status -u'
+alias scom='svn commit'
+alias slog='svn log | less'
+
+function svnst() {
+    tmpfile=/tmp/svn-stat.$$
+    [[ -f $tmpfile ]] && rm -f $tmpfile
+    svn stat
+    svn diff > $tmpfile
+    typeset -i added deled delta
+    added=`grep '^+' $tmpfile | wc -l`
+    deled=`grep '^-' $tmpfile | wc -l`
+    delta=$((added - deled))
+    if [[ delta -gt 0 ]]; then
+        delta_w=added
+        delta_sym='+'
+    else
+        delta_w=deleted
+        delta_sym='-'
+        delta=$((0 - delta))
+    fi
+    echo "  + ${added} lines"
+    echo "  - ${deled} lines"
+    echo "= ${delta_sym} ${delta} lines"
+    rm -f $tmpfile
+}
+
+# textmate
+alias e='mate'
+alias et='mate .'
+
+# global aliases - work anywhere on line
+alias -g C='|wc'
+alias -g CL='|wc -l'
+alias -g L='|less'
+alias -g H='|head'
+alias -g T='|tail'
+alias -g G='|grep'
+alias -g SH='>/dev/null 2>&1'
+alias -g BGD='& disown %1'
+
+
+# suffix aliases, 'alias -s ps=gv' makes '*.ps' expand to 'gv *.ps'
+# (globbing done after alias expansion!)
+#alias -s c=gvim
+#alias -s h=gvim
+#alias -s py=gvim
+#alias -s html=gvim
+#alias -s css=gvim
+
+function cd () {
+  if [[ -f $1 ]]; then
+    builtin cd $1:h
+  else
+    builtin cd $1
+  fi
+}
+
+function cl () {
+  cd $1
+  ls
+}
+
+# 2}}}
+
+# 10.2. ls Aliases {{{2
+# ----------------
+alias ls='gls -BF --color=auto'
+alias la='gls -AF --color=auto'
+alias ll='ls -l'
+alias lsd='ls -d'
+alias lld='ls -dl'
+
+function like(){
+  print -l **/*${1}*{,/**}
+}
+
+# 2}}}
+
+# 10.5. Miscellaneous Aliases {{{2
+# ---------------------------
+
+# 2}}}
+
+# 1}}}
+
+# 11. Unsorted (new) stuff {{{1
+# ========================
+
+export HISTFILE="$ZDOTDIR/zhistory"  # save history
+export HISTSIZE=100000
+export SAVEHIST=100000             # huge history buffer
+
+# if commands takes more than 60 seconds tell me how long it took
+export REPORTTIME=60
+
+# use less instead of the default more when no cmd is specified
+export READNULLCMD=less
+
+# set shell options
+setopt no_badpattern            # supress err msgs
+setopt cbases                   # 0xFF instead of 16#FF
+setopt globsubst                # parameter expns eligible for filename expn & generation
+setopt interactivecomments      # comments allowed in interactive shells
+setopt no_hup                   # leave bg tasks running (a la nohup)
+#setopt magicequalsubst         # performs filename expansion on 'arg' part of
+                                #  foo=arg parameters.
+
+
+#bindkey -v                      # vi style key bindings
+bindkey -e                      # emacs style key bindings
+bindkey '^I' complete-word      # complete on tab, leave expansion to _expand
+
+# default in linux is backspace sends ^H, emacs no likey
+#stty erase '^?'
+TERMINFO=$HOME/.terminfo
+
+function keep {
+    setopt localoptions nomarkdirs nonomatch nocshnullglob nullglob
+    kept=()         # Erase old value in case of error on next line
+    kept=($~*)
+    if [[ ! -t 0 ]]; then
+        local line
+        while read line; do
+            kept+=( $line )         # += is a zsh 4.2+ feature
+        done
+    fi
+print -Rc - ${^kept%/}(T)
+}
+alias keep='noglob keep '
+
+# 1}}}
+
+# more verbose completion prompt
+zstyle ':completion:*' format '%SCompleting %U%d%u%s'
+zstyle :completion::complete:cd:: tag-order \
+        local-directories path-directories
+
+# The following lines were added by compinstall
+
+zstyle ':completion:*' auto-description 'specify %d:'
+zstyle ':completion:*' completer _expand _complete _files
+zstyle ':completion:*' expand prefix
+#zstyle ':completion:*' format 'Complete %d:'
+zstyle ':completion:*' group-name ''
+zstyle ':completion:*' list-colors ${(s.:.)LS_COLORS}
+zstyle ':completion:*' list-prompt %SAt %p: Hit TAB for more, or the character to insert%s
+zstyle ':completion:*' list-suffixes true
+zstyle ':completion:*' matcher-list 'r:|[._-]=* r:|=*' 'r:|[._-]=* r:|=*' 'r:|[._-]=* r:|=*' 'r:|[._-]=* r:|=*'
+#zstyle ':completion:*' max-errors 2
+zstyle ':completion:*' menu select=0
+zstyle ':completion:*' select-prompt %SScrolling active: current selection at %p%s
+zstyle ':completion:*' verbose true
+zstyle :compinstall filename '/home/sjs/.zsh/.zshrc'
+
+autoload -Uz compinit
+compinit
+# End of lines added by compinstall
+
+#autoload -u promptinit
+#promptinit
+#prompt gentoo
+
+if false && which ssh-agent >/dev/null 2>&1; then
+    ssh-agent
+    ssh-add
+fi
+
+if which keychain >/dev/null 2>&1; then
+    keychain ~/.ssh/id_rsa #~/.ssh/seekport.id_rsa
+    source ~/.keychain/${KEYCHAIN_HOST}-sh > /dev/null
+fi
+
+export LC_ALL="en_CA.UTF-8"
+export LANG="en_CA.UTF-8"
+
+if [ -r "$HOME/.ruby/lib/sjs.rb" ]; then
+  export RUBYLIB="$HOME/.ruby/lib"
+  export RUBYOPT="rsjs"
+fi
+
+# vim: set fdm=marker fdl=3 foldminlines=3 :