Added Facebook login
Resolved Gemfile conflict
Cleaned up code cruft
Merge pull request #63 from benrudolph/add-fb-login

Add fb login