Change default shiftwidth to 4
Update submodules