Add spm support
solve merge conflicts in spmjs/add-spm-support

Conflicts:
	package.json
Merge branch 'spmjs-add-spm-support'