Changes up to 2013-$m-16 10:10
Merge branch 'master' of https://github.com/jacobian/dotfiles

Conflicts:
	.gitconfig