Sync deployed code with repository.

The live code diverged a little, but this pull request should take everything of value.