Added some more scala snippets
Conflict in vim-snippets
Added some plugins and color schemes