more gitignores
version of gen_html in sage is no longer used
rebase patches to account for mercurial patches
added a bunch of patches
Don't have SAGE_UPGRADING set when it shouldn't be