Updated descriptions of ornery
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