fixed shiftwidth and added git info