Use fasd instead of Rupa's z script
Don't source history-substring-search directly

Also, I'm not ready to use the plugin yet so I'm leaving that setting
commented out.