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

gaearon/JSXHint,henricavalcante/JSXHint,STRML/JSXHint,CondeNast/JSXHint,CondeNast/JSXHint,Shriken/JSXHint,thomasboyt/JSXHint