Added shifttabwidth=4, which seems to have fixed the extra indent being added at code block starts