* add a mood/ornery public API unit test
Updated descriptions of ornery
* update some outdated comments, turn tabs into spaces
Merge pull request #1243 from cgolubi1/ornery_api_tests

add a mood/ornery public API unit test
Merge remote-tracking branch 'upstream/master' into ornery_description
Updated descriptions of ornery in unit test
Merge pull request #1250 from blackshadowshade/ornery_description

Updated descriptions of ornery