Another MatchParen style tweak.
Merge branch 'master' of git@github.com:eswald/dotfiles
Merge branch 'master' of git@github.com:eswald/dotfiles
Catering to python 2.4
Merge branch 'master' of git@github.com:eswald/dotfiles
Merge branch 'master' of git@github.com:eswald/dotfiles
Merge branch 'master' of git@github.com:eswald/dotfiles
Merge branch 'master' of git@github.com:eswald/dotfiles

Conflicts:

	.python/eswald/unique_history.py