upgrade package.json
update to latest version of async package
Merge remote-tracking branch 'origin/master'

Conflicts:
	package.json