hgrc removing uncleaned merge stuff
Added mercurail & git bash completion