Merge branch 'master' of git://github.com/misterbisson/bsocial into social
Merge branch 'social' of github.com:methnen/bsocial into social
Small tweaks.