ENYO-3902: Fix issue with grouping in Firefox, general clean up.

Enyo-DCO-1.1-Signed-off-by: Aaron Tam <aaron.tam@lge.com>
Merge pull request #689 from enyojs/ENYO-3902-aarontam

ENYO-3902: Fix issue with grouping in Firefox, general clean up.

Reviewed-By: Cole Davis (cole.davis@lge.com)