Install vim-jsx
Merge branch 'master' into macosx