Solidify package dependencies

Conflicts:

	package.json