Merge branch 'melissa/fb-login' of github.com:calblueprint/watershed

* 'melissa/fb-login' of github.com:calblueprint/watershed:
  Update cocoapods to 0.34.4
  Add the facebook api endpoint
  Store the facebook id from the client
  Add network request for facebook login to the ios client
  fb auth token
  parse fb data
  successful login
  import SDK once
  fb login delegate
  fb permissions
Merge branch 'master' of github.com:calblueprint/watershed

* 'master' of github.com:calblueprint/watershed:
  small fixes
  Require the email and name to be present, add more validations later
  Forgot to migrate, self. is no longer neceessary
  sign_up fb route
  animated settings transition
  Specify we want the facebook_auth_token field on the user
  Skip authorization for users/create and user faceook login. Also, require a facebook_auth_token