minor formatting changes
Merge remote-tracking branch 'origin' into joshua-smith
fixed merge conflicts
fixed filtering check for compare group view
Merge remote-tracking branch 'origin' into joshua-smith
merge conflicts
Merge pull request #16 from jeffdill2/joshua-smith

Joshua smith