rails 3.2.19 -> 3.2.21
WIP: FIXING SPECS
WIP: Fix specs. Removed noise, skipped more
WIP: Fixed error in the user/membership team relationship
WIP: Fixing tests and code for the Team functionality
Merge pull request #250 from codebender/bump_rails_to_3_2_21

rails 3.2.19 -> 3.2.21