Update STYLE, incorporating wiki; close #468

I don't understand this sentence; the pull request doesn't change as master is updated.  It may be the case that merging it will result in non-compiling code, but Travis won't warn about this until after we merge.