debugged login for facebook/google. Prepped for merge with master