Reduce amount of global variables
Merge branch 'master' into refactor

Conflicts:
	viz/js/birds.js