Merge branch 'data-uri-imports'

* data-uri-imports:
  Rewrite imports detection algorithm.
  Fixing lint errors

Conflicts:
	lib/middleware.js