MT-ified the face thing, re-arranged some things, too.
Merge branch 'master' of github.com:xj9/xj9.github.com