mercurial: add aliases and some templates
Merge branch 'master'