fixed bug with sugarfeed options and other minor changes.
Merge remote-tracking branch 'origin/socialintegration' into socialintegration