Add AMD concatenation support, 0.20.0
Merge branch 'amd'

Conflicts:
	package.json