GitLab

Conflicts:
	cmd/ipfs/add.go
	cmd/ipfs/cat.go
	cmd/ipfs/ls.go
	cmd/ipfs/mount_unix.go

vendor dependencies using Godep

dependencies are vendored into Godeps/_workspace and commit versions are
recorded in Godeps.json

update datastore to e89f0511
update go.crypto

Conflicts:
	routing/dht/dht.go

Conflicts:
	crypto/key.go