Merge wiki edits

Thanks mainly to Tim Cera for this.