more tests
Merge remote-tracking branch 'origin/master'

Conflicts:
	bower.json
	dist/delta.js
	package.json
updated .gitignore for generated test files
version bump