Final merge of master to Twitch branch.

This branch works -- of course it's personally-configured at this point.