6to5 support

Conflicts:
	package.json