Initial commit
Added basic dotfiles

added osxkeychain integration to git config
removed the function to use git diff as it's playing up. added color ls export
Merge branch 'master' of github.com:afarrell/dotfiles
merge in Alex James Farrell's dotfiles.
Merge branch 'master' of github.com:amfarrell/dotfiles

Conflicts:
	aliases