changes to CMakeLists to remove double links on OS X
Merge branch 'master' of github.com:worklist/hifi