fb auth and fixes to wit
gemfile change
Merge branch 'fbauth'
fixes conflicts