Fixed merging of PR's, added spacing to `toolTipUnit` and fixed some JSHint errors
Fixed merging of PR's, added spacing to `toolTipUnit` and fixed some JSHint errors

DKirwan/calendar-heatmap,DKirwan/calendar-heatmap