merge

Merge branch 'master' of github.com:CondeNast/JSXHint
merge

Merge branch 'master' of github.com:CondeNast/JSXHint