Another round of updates
Merge branch 'master' of github.com:everything2/everything2