Resolves gh-77.
Merge branch 'master' into graphical-playground

* master:
  Resolves gh-77.

Conflicts:
	dist/flocking-all.min.js