I updated these groups based on yoko's changes to the spreadsheet https://docs.google.com/a/wikia-inc.com/spreadsheet/ccc?key=0AvplKmSKE0r2dE5wSHNXTURPaGJuemZodEJuY0xjd0E&usp=drive_web#gid=1