lib/superstatic -> lib/index
update test requires for lib/index
Merge branch 'pr/67'

Conflicts:
	test/superstatic.js
Merge branch 'master' into service-architecture

Conflicts:
	bin/server