Update .hgrc

add vimdiff as merge tool, change alias for recent commits