More ifndefs..
Merge branch 'master' of https://github.com/brianstamper/code-scratch-area