rad fuckin prompts for fish + zsh

+ make zsh prompt 300% more awesome
+ fix fish alias after pull request to Hub was accepted
update wikipedia.js docs
trying out vimdiff for git mergetool
gitconfig whitespace cleanup
rm autosetupmerge
emacs is back

ediff for git merge
version iTerm profile
nice vim diff colors
move Solarized + ST2 configs under git control

mwah ha ha...
better icons for ST
default font size for st2
ediff.sh script rename got lost?
enable reseting font size to default
alias for git diff by words
update setup script