rad fuckin prompts for fish + zsh

+ make zsh prompt 300% more awesome
+ fix fish alias after pull request to Hub was accepted
update links
update header notes
no more hub. sorry, @defunkt.
trying out vimdiff for git mergetool
gitconfig whitespace cleanup
rm autosetupmerge
ediff option for git mergetool