Revert 45452f3..3b7197c

This rolls back to commit 45452f31dbf157d80277d76344a97daa8a917167.
Fixed commit issues, added Facebook login