Cleaned up Mac Demo, reducing SLOC, clarifying, etc.

Also fixes an erroneous Xcode "validation" warning.  All functionality
retained + tested at 100%.
Merge pull request #1 from mralexgray/mac-demo-tidy

Cleaned up Mac Demo, reducing SLOC, clarifying, etc.