add 'which ' function
Merge branch 'master' of https://github.com/alexr/dotfiles