jscs on bootstraps
fix merges
Merge pull request #6226 from guardian/jscs-bootstraps

Include bootstraps in JSCS validation