Bring sproutsocial branch up to 0.5.4

Merging latest from upstream with master