6ef2e1f51c42a1e8b96f5ffc8a5b8f1e715d1738

 1diff --git a/lib/aliases.zsh b/lib/aliases.zsh
 2index cd17781a68635b6b51c9e8117d5f9e25740c85a5..da61685069748a08877dfefe02964f100a9fd53b 100644
 3--- a/lib/aliases.zsh
 4+++ b/lib/aliases.zsh
 5@@ -1,19 +1,23 @@
 6+#!/bin/zsh
 7+
 8+# Push and pop directories on directory stack
 9 alias pu='pushd'
10 alias po='popd'
11 
12-alias sc='ruby script/console'
13-alias sd='ruby script/server --debugger'
14+# Ruby related
15 alias ss='thin --stats "/thin/stats" start'
16 
17-alias mr='mate CHANGELOG app config db lib public script spec test'
18+# Basic directory operations
19 alias .='pwd'
20 alias ...='cd ../..'
21 
22+# Super user
23 alias _='sudo'
24 alias ss='sudo su -'
25 
26 #alias g='grep -in'
27 
28+# Git related
29 alias g='git'
30 alias gst='git status'
31 alias gl='git pull'
32@@ -24,24 +28,36 @@ alias gca='git commit -v -a'
33 alias gb='git branch'
34 alias gba='git branch -a'
35 
36+# Show history
37 alias history='fc -l 1'
38 
39-alias ls='ls -F'
40+# List direcory contents
41+#alias ls='ls -F' # This messes up colors on my linux system
42+alias l='ls -la'
43 alias ll='ls -alr'
44-alias l='ls'
45-alias ll='ls -l'
46 alias sl=ls # often screw this up
47 
48 alias sgem='sudo gem'
49 
50+# Find ruby file
51 alias rfind='find . -name *.rb | xargs grep -n'
52 
53+# Git and svn mix
54 alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
55 
56+# TextMate
57 alias et='mate . &'
58 alias ett='mate app config lib db public spec test Rakefile Capfile Todo &'
59 alias etp='mate app config lib db public spec test vendor/plugins vendor/gems Rakefile Capfile Todo &'
60 alias etts='mate app config lib db public script spec test vendor/plugins vendor/gems Rakefile Capfile Todo &'
61 
62+## Ruby related
63+# Ruby scripts
64+alias sc='ruby script/console'
65+alias sd='ruby script/server --debugger'
66+
67+# Editor Ruby file in TextMate
68+alias mr='mate CHANGELOG app config db lib public script spec test'
69+
70 
71 
72diff --git a/lib/completion.zsh b/lib/completion.zsh
73index 795903d0dee5a4433955814241e6c8ae3845ae13..7a564d640524bf006c8ac897735c1c6b8726ff33 100644
74--- a/lib/completion.zsh
75+++ b/lib/completion.zsh
76@@ -14,7 +14,7 @@ compinit
77 zmodload -i zsh/complist
78 
79 ## case-insensitive (all),partial-word and then substring completion
80-zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'
81+#zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'
82 
83 zstyle ':completion:*' list-colors ''
84 zstyle ':completion:*' hosts $( sed 's/[, ].*$//' $HOME/.ssh/known_hosts )
85@@ -32,8 +32,7 @@ zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#) ([0-9a-z-
86 zstyle ':completion:*:*:*:*:processes' command "ps -u `whoami` -o pid,user,comm -w -w"
87 zstyle ':completion:*:*:(ssh|scp):*:*' hosts `sed 's/^\([^ ,]*\).*$/\1/' ~/.ssh/known_hosts`
88 
89-
90-#complete on history
91+# Complete on history
92 # zstyle ':completion:*:history-words' stop yes
93 # zstyle ':completion:*:history-words' remove-all-dups yes
94 # zstyle ':completion:*:history-words' list false