v0.2.5
Merge remote-tracking branch 'origin/master'

Conflicts:
	package.json
	vidzapper.js