Revert "fixed merge conflict"

This reverts commit 3c985d7e920548fd86e0ce9c6ccc1e99ad2ee998, reversing
changes made to c0a7c99d94a989f8bdf10e94ecdb5ddd8f80e4dd.
Revert "some namespacing issues fixed to avoid STK clashes. audio code removed. stk is blowing up , twas unwise to mix 2 versions which may still be happening. gf-utils is basically commented out."

This reverts commit c0a7c99d94a989f8bdf10e94ecdb5ddd8f80e4dd.
Revert "added stk files"

This reverts commit f534423df682c5a9c35c8e59221997edc9d3fc22.