less should wrap lines (re: diff)
Merge branch 'master' of github.com:elon/dotfiles

Conflicts:
	bin/configure_git