Change shiftwidth to 2 for code files (py, sh, etc.)
Merge branch '3.0' of https://github.com/paulhybryant/spf13-vim into 3.0