Added facebook login and started work on rewriting a few things
Minor comment
Merge branch 'facebook'