Resyncing file changes.

Updating files so that I'm back in sync with the current state of the
blog. Mostly for getting functions.php and style.css to have their
proper content.