Added Altra Federal Credit Union to banking
Merge remote-tracking branch 'upstream/master'
Correct alphabetization
Merge pull request #661 from dsoegijono/patch-1

Correct alphabetization
Merge pull request #557 from Mitlik/master

Added Altra Federal Credit Union to banking
Add about.me
Add Ustream
Merge pull request #663 from dsoegijono/ustream

Add Ustream to Entertainment
Add Codecademy
Merge pull request #662 from dsoegijono/aboutme

Add about.me
Add exception to OpenDNS
Merge pull request #666 from dsoegijono/patch-2

Add exception to OpenDNS
Merge pull request #665 from dsoegijono/codecademy

Add Codecademy to Education
changed twitter of ustream, netflix and spotify
Add automatic opt in info for providing phone #
Changed Mojang's twitter acc
Merge pull request #668 from jdavis/discover

Update Discover exception
Merge pull request #669 from Carlgo11/master

Shanged twitter of ustream, netflix, spotify and mojang