clean up
added missing groups and fixed group ids
Merge pull request #16 from pennatula/master

Fixed Group refs, group ids and added missing groups