STYLE: Update defines to be consistent with each other.

Also updated cut-off README.md documentation on the defines.
Merge remote-tracking branch 'github/master'