Added 'which' command
Merge branch 'master' of https://github.com/alienelephant/kippo-frankenstein