Tidy up API into Sound Generator
Merge remote-tracking branch 'origin/master'
Fixes for Xcode 6.1