Refactoring/rubifying spec/models/*
Referee "refactoring" (plus p_m and p_t).
Changes to user model and tests.
Deleted match_types table. All tests passing.