Fix helper function and undo bad merge#16

Merged

jwenfai merged 2 commits intoOuranosinc:masterfrom

Feb 2, 2019

Commits on Feb 1, 2019

In groupby.py, moved s to _get_index_and_items helper function.
jwenfai
committed

Commits on Feb 2, 2019

Removed redundant code from test_formatting.py due to bad merge.
jwenfai
committed