Shamelessly stole Bullies' TeamPlayer and TriggerHappy's Goalie.
Fixed merged conflicts.