Update hgrc and enable vimdiff
Merge remote-tracking branch 'upstream/release/0.2.0' into develop

Conflicts:
	mercurial/hgrc