v0.2.4

Update deps, clean up
Merge branch 'origin/master'

Conflicts:
	index.js
Merge branch 'origin/master'
v0.2.5

merge in changes, update deps