Merge branch 'master' of github.com:rbdr/dotfiles

[rbdr/dotfiles] / gitconfig

[user]
	name = Ben Beltran
	email = ben@nsovocal.com
[core]
	editor = vim
[color]
	diff = auto
[push]
	default = simple