Docblock fixes and one assignment typo
addHaving()'s parameters are the same as those of getCriterionForCondition
Pulled out assignment typo to clean up PR
More docblock fixes.
Merge pull request #597 from bjdelange/master

Docblock fixes