Merge branch 'buffer-benchmarks' of https://github.com/p-e-w/micro into p-e-w-buffer...

diff --cc Makefile
Simple merge

diff --cc internal/buffer/buffer_generated_test.go
Simple merge

diff --cc internal/buffer/buffer_test.go
index ea017156b36951c695b72dddd5fde5daba9a291e,20597662d6cb53bbb5ef5f7252740b609bc41724..f6ee3dee9af05f57b5c6688257db205df241cc89
--- 1/internal/buffer/buffer_test.go
--- 2/internal/buffer/buffer_test.go
+++ b/internal/buffer/buffer_test.go
@@@ -1,13 -1,16 +1,15 @@@
  package buffer
  
  import (
+       "math/rand"
        "strings"
        "testing"
+       "unicode/utf8"
  
-       testifyAssert "github.com/stretchr/testify/assert"
+       "github.com/stretchr/testify/assert"
        lua "github.com/yuin/gopher-lua"
--
 -      "github.com/zyedidia/micro/internal/config"
 -      ulua "github.com/zyedidia/micro/internal/lua"
 +      ulua "github.com/zyedidia/micro/v2/internal/lua"
++      "github.com/zyedidia/micro/v2/internal/config"
  )
  
  type operation struct {