Merge branch 'master' into add-my-aliases

This commit is contained in:
Paul Curry 2014-10-11 17:53:25 -04:00
commit 1401fc737b
87 changed files with 1223 additions and 274 deletions

View file

@ -32,7 +32,6 @@ alias lah='ls -lah'
alias l='ls -lah'
alias ll='ls -lh'
alias la='ls -lAh'
alias sl=ls # often screw this up
alias afind='ack-grep -il'