more conflict resolution

Not 100% sure what happened here, but rebased your changes against mine to get my fork back in line, and ended up with duplicate commits? Or perhaps they'll just merge in nicely. In any case, the relevant fixes here are to the homepage and the rest is artifacts from rebasing.