unset the which function before setting

This makes sure that if you do  or something, you won't
fork-bomb the system. Great success.
Merge branch 'master' of ssh://github.com/hershal/conf.d