Merge with upstream.

Author: sjl

.gitignore

@@ -5,5 +5,6 @@ custom
 custom/*.zsh
 *.un~
 cache
+*.swp
 
 .DS_Store

lib/aliases.zsh

@@ -0,0 +1,24 @@
+# Push and pop directories on directory stack
+alias pu='pushd'
+alias po='popd'
+
+# Basic directory operations
+alias ...='cd ../..'
+alias -- -='cd -'
+
+# Super user
+alias _='sudo'
+
+#alias g='grep -in'
+
+# Show history
+alias history='fc -l 1'
+
+# List direcory contents
+alias lsa='ls -lah'
+alias l='ls -la'
+alias ll='ls -l'
+alias sl=ls # often screw this up
+
+alias afind='ack-grep -il'
+