updates dependencies, minor cleanup
Merge branch 'origin/master'

Conflicts:
	package.json
Merge branch 'origin/master'
update deps