Merge branch 'source-node-from-string-with-map'
Merge branch 'source-map-gen-apply-map'
Merge branch 'source-map-gen-remove-source'

Conflicts:
	lib/source-map/source-map-generator.js