Added basic .gitconfig. Updated README to add git name/email
Merge branch 'master' of http://github.com/nicr9/dotfiles

Conflicts:
	README