use 'oauth2' google service instead of 'plus' service
Merge pull request #7 from dannyclark/develop

fix for google users who haven't signed up to google plus
Merge branch 'develop' of github.com:mattupstate/flask-social into develop
Update installation section to always use PyPI.

I'm assuming at the time the Flask-Social documentation was written,
Flask-MongoEngine and Facebook-SDK weren't on PyPI yet. I can install
from these locations without any issues, so let's simplify these docs.
Allow SOCIAL_<PROVIDER> settings to be None.

With this, you can be explicit about what settings are expected
in your root settings.py file. SOCIAL_FACEBOOK can be None, for
example, and overridden in another file or in the environment.

Here's my personal setup:

    SOCIAL_TWITTER = {
        'consumer_key': os.environ.get('TWITTER_CONSUMER_KEY'),
        'consumer_secret': os.environ.get('TWITTER_CONSUMER_SECRET'),
    } if os.environ.get('TWITTER_CONSUMER_KEY') else None

It would be ideal if 'consumer_key' could allow None, but I didn't want
to break the OAuth mechanism in this commit, so this is good enough.
Merge pull request #12 from joeyespo/develop

Update installation section to always use PyPI
Merge pull request #13 from joeyespo/nullable-settings

Allow SOCIAL_<PROVIDER> settings to be None
Fix hyphen in README
Update release date in CHANGES
Fix merge conflict from mster
Merge branch 'eriktaubeneck/develop' into HEAD