Improved social button loading (specifically so google plus loads correctly).
Fix bug where Google +1 button may fail to appear.
Merge branch 'master' into demo