Merge pull request #2 from jdavis/master

Update my master with real website
Merge pull request #3 from jdavis/master

Update my master with real website
Changed img name
Revert "Changed img name"

This reverts commit 5ba48ca5e226610b15fef36c507bb93255a1d115.
Merge pull request #4 from jdavis/master

Merge jdavis' Master with Mine
Update providers.yml
Portalguard logo
Merge pull request #1 from mxxcon/Portalguard

Portalguard logo
Update providers.yml
added PhraseApp to list of services
Update providers.yml
Added WWPass logo
Update providers.yml
Merge pull request #780 from colinmahns/master

Added Riseup Mail to email.yaml
Update providers.yml
Merge pull request #688 from PortalGuard/patch-1

Update providers.yml
Update providers.yml
Merge pull request #776 from w3ua/wwpass.png

Update providers.yml
updating mixpanel's tfa status
heroku 2fa is no longer in beta.

https://blog.heroku.com/archives/2014/9/25/two-factor-authentication-ga