Organize C_DEFINES alphabetically.

This makes it easier to deal with subsequent changes that will
be coming.
Missing word in comment in src/settings.js.
Merge pull request #1445 from waywardmonkeys/c-defines

C defines
Fix the build, missing comma.
Merge pull request #1448 from waywardmonkeys/fix-build

Fix build