Added vimdiff alias to gitconfig
Added hgrc file