Finally got the base refactor working (without serious errors: segfault, etc).  There's more work to be done, but I need a good rollback point.
Fixed the audio issue (when you click on a button).
Merge branch 'remove-globals'
Added paths to the Framework Search Paths and the Header Search Paths for both the run and test targets.  This was to allow these things to run for Carlos O. in MacInTheCloud and for anyone else who has to install things in their ~/Library/Framework directory (e.g. OCHamcrest and OCMockito).