Indentation size to 2 for javascript
Merge branch 'master' of https://github.com/jpcaissy/vimrc
Fixed merge