Added vimrAdded vimrcc
Add gitconfig
Added vimrcmac
Merge branch 'master' of https://github.com/GeckoSplinter/Config

Conflicts:
	.gitconfig
	.vimrc