This pull is really to get the sort by rating working. I also patched up a few of the other Conversation things when trying to get to the point of being able to test it though.
Merge remote-tracking branch 'upstream/master' into fixes-6
Merge pull request #480 from ExchangeCore/fixes-6

Fixes Conversation Sort by Rating