Merge

It's so hot that our web host (which is in California, actually) had a generator catch on fire on Friday and a server meltdown on Monday. Sorry for the downtime; Gapers Block should be now back to its usual reliable self.