Add gitgutter and update surround plugin