Modified grouping to use a single grouping key.
Merge branch 'master' of github.com:snap-stanford/snapr

Conflicts:
	ringo/Makefile
	ringo/TableTest.cpp
	snap-core/table.cpp
	snap-core/table.h