handle jade templates (JS)
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