Use jsxhint
Upgrade vim bunbles
Merge branch 'master' into macosx