resolve merge conflicts
resolve merge conflicts

cpollard1001/core,orcproject/orc,retrohacker/core,bookchin/orc,aleitner/core,bookchin/orc,orcproject/orc,Storj/node-storj,Storj/core,gordonwritescode/storj-core