Added color options to git config. Added aliases for using patience algorithm
for merge and diff
Merge branch 'master' of https://github.com/calebsmith/vimrc