npm-related corrections, as pointed out by @yhsiang
Merge branch 'devel' of github.com:swarmjs/swarm into noexamples
Merge branch 'master' of github.com:gritzko/swarm
Merge branch 'master' of github.com:gritzko/swarm