Added ifdef guards to searchmechanism header files. Updated skill server to support new search mechanisms. Have not tested new search mechanisms-- execute at your own risk.
Merge branch 'master' of https://github.com/hayesbh/Social-Hierarchical-Learning