Use the right license key shell var
Merge branch 'master' of heroku.com:wonderbars
Update social plugins and add domain-specific helpers