more jscs updates
Merge pull request #6464 from guardian/analytics-jscs-tidy

More jscs changes