Clean up animation
Merge branch 'master' into gh-pages

Conflicts:
	.gitignore
	jelly.js
	jelly.map
	src/es6/jelly.js