Updated indent settings
Added vim surround