Merge pull request #3966 from ZappoMan/untangling

Untangling - step toward librarization
Merge branch 'master' of https://github.com/highfidelity/hifi into InterfaceConfigEctomy