Adding merginal for git and scala syntax
Merge branch 'master' of github.com:bthemad/vimfiles