update deps
0.6.2
Merge branch 'master' into compile

Conflicts:
	README.md
	package.json