Certain files now have a shiftwidth of 2.
Merge branch 'master' of https://github.com/Petesta/vim-config