Enable rerere
Merge branch 'master' of github.com:phatblat/dotfiles

Conflicts:
	.gitconfig