Add defines to scribe build
Merge branch 'master' of github.com:mgregson/mgregson-overlay