some additional aliases
os x ls colors
improve merge
some osx goodies
normal escape time
i use hybrid now :)