Social auth: Facebook and Twitter

Added preliminary Facebook and Twitter login support, as well as the
structure for other logins
Resolving conflicts
minor

Deleting .pyc