Refactor gplus.js
Fix merge conflicts?