hgrc merge tool fix, wallpaper.sh fix
Merge branch 'master' of https://github.com/kazufukurou/dotfiles