Add Kindle and fix hg package (now renamed to mercurial)