Update dependencies

Conflicts:
	package.json
Bump version
Merge pull request #2 from gramergrater/master

Update dependencies