Set different tabstops and shiftwidths based on filetype
Merge remote-tracking branch 'origin/master'