Grunt after Update

Changes from running grunt after merging changes from tabs master branch