Enable line-wrapping of git diff output by default

ht http://durdn.com/blog/2012/12/05/git-12-curated-git-tips-and-workflows/
Add npm/bin to PATH
Clean up white space
wgetrc no longer needed now that I've switched from macports to homebrew
Remove references to TextMate (I've switched to Sublime Text 2)
Add zencoding for vim
Tab stop 2, except python
Merge remote-tracking branch 'upstream/master'

Conflicts:
	bashrc