added proper syntax highlighting for .json files
updated instalation directions
added scala syntax highlighting
Merge branch 'master' of https://github.com/amcglathery/Vimrc