This diff was generated by: * `godep restore -v`, correcting any hiccups until it succeeded * `rm -rf vendor/ Godep` * `godep save -v ./...`
12eb536b25