Update CMakeLists.txt for #567
Update CMakeLists.txt for #567
Merge pull request #568 from cosmoharrigan/567

Update CMakeLists.txt for #567
Merge branch 'master' into wtf

Conflicts:
	opencog/benchmark/module/CMakeLists.txt
Fix some of the CMakefile confusion
Merge pull request #570 from linas/wtf

misc fixes, guile compilation experiment.
Upgrade lib json_spirit from 4.03 to 4.06
Merge pull request #571 from cosmoharrigan/json_spirit

Upgrade lib json_spirit from 4.03 to 4.06
change to use lemma instead of input string words
InheritanceToMemberRule was disabled in the default InferenceAgent. Re-enable it.
Inference history was disabled. Re-enable it, using the main atomspace, and don't 'copy' atoms.
formulas.py contains duplicate definitions of 'inheritanceFormula'. Disable one.
Update docstring formatting for GeneralEvaluationToMemberRule
Add inference agent for Tuffy 'smokes' example
Add inference agent for Tuffy 'smokes' example
Update __init__.py for module
Merge pull request #573 from cosmoharrigan/pln-updates

PLN: example agent for Tuffy 'smokes' problem, plus some small updates
Merge pull request #572 from AmeBel/r2l

Fix an error
change the bnechmark api for scheme
refactor the scheme emasurement code