25b1cd687b28cb8d05229130ee5a0e2494276894

 1diff --git a/lib/aliases.zsh b/lib/aliases.zsh
 2index aae865046ef6ea7467deb675a5cbd82bfdac9a94..c67f854a73379bc0e25ae8fc245eafedbe37918d 100644
 3--- a/lib/aliases.zsh
 4+++ b/lib/aliases.zsh
 5@@ -1,11 +1,3 @@
 6-# Push and pop directories on directory stack
 7-alias pu='pushd'
 8-alias po='popd'
 9-
10-# Basic directory operations
11-alias ...='cd ../..'
12-alias -- -='cd -'
13-
14 # Super user
15 alias _='sudo'
16 alias please='sudo'
17@@ -25,11 +17,6 @@ then
18 else
19     alias history='fc -l 1'
20 fi
21-# List direcory contents
22-alias lsa='ls -lah'
23-alias l='ls -lah'
24-alias ll='ls -lh'
25-alias la='ls -lAh'
26 
27 alias afind='ack-grep -il'
28 
29diff --git a/lib/directories.zsh b/lib/directories.zsh
30index 02743e0c78130bb05f7150cd3ade0a14b98c7831..1693d5dd101c45b3a3e565544de19f6a97df53c9 100644
31--- a/lib/directories.zsh
32+++ b/lib/directories.zsh
33@@ -3,12 +3,10 @@ setopt auto_pushd
34 setopt pushd_ignore_dups
35 setopt pushdminus
36 
37-alias ..='cd ..'
38-alias cd..='cd ..'
39-alias cd...='cd ../..'
40-alias cd....='cd ../../..'
41-alias cd.....='cd ../../../..'
42-alias cd/='cd /'
43+alias -g ...='../..'
44+alias -g ....='../../..'
45+alias -g .....='../../../..'
46+alias -g ......='../../../../..'
47 
48 alias 1='cd -'
49 alias 2='cd -2'
50@@ -20,23 +18,17 @@ alias 7='cd -7'
51 alias 8='cd -8'
52 alias 9='cd -9'
53 
54-cd () {
55-  if   [[ "x$*" == "x..." ]]; then
56-    cd ../..
57-  elif [[ "x$*" == "x...." ]]; then
58-    cd ../../..
59-  elif [[ "x$*" == "x....." ]]; then
60-    cd ../../../..
61-  elif [[ "x$*" == "x......" ]]; then
62-    cd ../../../../..
63-  elif [ -d ~/.autoenv ]; then
64-    source ~/.autoenv/activate.sh
65-    autoenv_cd "$@"
66-  else
67-    builtin cd "$@"
68-  fi
69-}
70-
71 alias md='mkdir -p'
72 alias rd=rmdir
73 alias d='dirs -v | head -10'
74+
75+# List direcory contents
76+alias lsa='ls -lah'
77+alias l='ls -la'
78+alias ll='ls -l'
79+alias la='ls -lA'
80+alias sl=ls # often screw this up
81+
82+# Push and pop directories on directory stack
83+alias pu='pushd'
84+alias po='popd'