Bringing master up to the properly tested state.

Tests running, facebook login bugs squashed.