Merge branch '2449-keep-write-blocks' into 2449-keep-flags

diff --cc services/keep/keep.go
index 897e5040f7f9daf7c27e117f492458dd0655fe55,7cca5344d8a2abc074cfb0f0f4dbd66d4fd2f0af..85e2aea5ef2007408cadbfcc1cc555ab6867221e
--- 1/services/keep/keep.go
--- 2/services/keep/keep.go
+++ b/services/keep/keep.go
@@@ -5,9 -5,9 +5,10 @@@ import 
        "bytes"
        "crypto/md5"
        "errors"
 +      "flag"
        "fmt"
        "github.com/gorilla/mux"
+       "io/ioutil"
        "log"
        "net/http"
        "os"